bluez4: Install the test script

(From OE-Core rev: c55918d73318fb86af122529bf1034826268356b)

Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 31 insertions, 1 deletions

diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
new file mode 100644
index 0000000000..23f7d999b3
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Inappropriate
+
+Install the bluez's test scripts
+
+Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
+diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools
+--- bluez-4.101.orig/Makefile.tools     2013-11-19 15:49:07.688838000 +0800
++++ bluez-4.101/Makefile.tools  2013-11-19 15:50:09.256837848 +0800
+@@ -227,6 +227,17 @@
+                test/service-spp.xml test/service-opp.xml test/service-ftp.xml \
+                test/simple-player test/test-nap
+ 
++bluez4_testdir = $(libdir)/bluez4/test/
++dist_bluez4_test_SCRIPTS = test/sap-client test/hsplay test/hsmicro \
++               test/monitor-bluetooth test/list-devices \
++               test/test-discovery test/test-manager test/test-adapter \
++               test/test-device test/test-service test/test-serial \
++               test/test-telephony test/test-network test/simple-agent \
++               test/simple-service test/simple-endpoint test/test-audio \
++               test/test-input test/test-sap-server test/test-oob \
++               test/test-attrib test/test-proximity test/test-thermometer \
++               test/test-serial-proxy test/test-health test/test-health-sink \
++               test/simple-player test/test-nap
+ if HIDD
+ bin_PROGRAMS += compat/hidd
+ 
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index d6c3e261f6..7127619ddf 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -7,6 +7,7 @@ SRC_URI += "file://bluetooth.conf \
             file://fix-udev-paths.patch \
             file://obsolete_automake_macros.patch \
             file://network-fix-network-Connect-method-parameters.patch \
+            file://install-test-script.patch \
 "
 
 SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
@@ -23,9 +24,10 @@ do_install_append() {
 }
 
 RDEPENDS_${PN}-dev = "bluez-hcidump"
+RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
 
 ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez"
+PACKAGES =+ "libasound-module-bluez ${PN}-testtools"
 
 FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
 FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
@@ -34,6 +36,8 @@ FILES_${PN}-dev += "\
   ${libdir}/alsa-lib/*.la \
 "
 
+FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
+
 FILES_${PN}-dbg += "\
   ${libdir}/bluetooth/plugins/.debug \
   ${libdir}/*/.debug \