From 9cabc4309297beefe586beb81c8258d57b88f03d Mon Sep 17 00:00:00 2001 From: "arron.wang" Date: Fri, 8 Jun 2012 12:04:05 +0800 Subject: [PATCH] Install more test script to test subpackage --- Makefile.am | 24 +++++++++++++++++++++++ Makefile.tools | 2 +- packaging/bluez.changes | 3 +++ packaging/bluez.spec | 6 ------ packaging/install-more-binary-test.patch | 11 ----------- packaging/install-test-scripts.patch | 33 -------------------------------- 6 files changed, 28 insertions(+), 51 deletions(-) delete mode 100644 packaging/install-more-binary-test.patch delete mode 100644 packaging/install-test-scripts.patch diff --git a/Makefile.am b/Makefile.am index bd587eb..b6f74bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -422,6 +422,30 @@ CLEANFILES += $(rules_DATA) EXTRA_DIST += scripts/bluetooth.rules \ scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules +test_scripts = test/apitest \ + test/hsplay \ + test/hsmicro \ + test/list-devices \ + test/monitor-bluetooth \ + test/simple-agent \ + test/simple-service \ + test/test-adapter \ + test/test-audio \ + test/test-device \ + test/test-discovery \ + test/test-input \ + test/test-manager \ + test/test-network \ + test/test-serial \ + test/test-service \ + test/test-telephony + + +if TEST +testdir = ${pkglibdir}/test +test_SCRIPTS = ${test_scripts} +endif + EXTRA_DIST += doc/manager-api.txt \ doc/adapter-api.txt doc/device-api.txt \ doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \ diff --git a/Makefile.tools b/Makefile.tools index f997a3f..9e26057 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -161,7 +161,7 @@ sbin_PROGRAMS += test/hciemu bin_PROGRAMS += test/l2test test/rctest -noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \ +bin_PROGRAMS += test/gaptest test/sdptest test/scotest \ test/attest test/hstest test/avtest test/ipctest \ test/lmptest test/bdaddr test/agent \ test/btiotest test/test-textfile \ diff --git a/packaging/bluez.changes b/packaging/bluez.changes index 5ed0e68..9e916c2 100644 --- a/packaging/bluez.changes +++ b/packaging/bluez.changes @@ -1,3 +1,6 @@ +* Fri Jun 8 13:15:54 CST 2012 Arron - 4.99 +- Install more test script to test subpackage + * Fri Jun 8 13:03:17 CST 2012 Arron - 4.99 - Remove already merged patches diff --git a/packaging/bluez.spec b/packaging/bluez.spec index 54e83a1..8b0f395 100644 --- a/packaging/bluez.spec +++ b/packaging/bluez.spec @@ -7,9 +7,7 @@ License: GPLv2+ URL: http://www.bluez.org/ Source0: %{name}-%{version}.tar.gz Source1: bluetooth.service -Patch0: install-more-binary-test.patch Patch1: audio_conf.patch -Patch2: install-test-scripts.patch Requires: bluez-libs = %{version} Requires: dbus >= 0.60 Requires: usbutils @@ -109,12 +107,8 @@ Scripts for testing BlueZ and its functionality %prep %setup -q -n %{name}-%{version} -#install-more-binary-test.patch -%patch0 -p1 #audio_conf.patch %patch1 -p1 -#install-test-scripts.patch -%patch2 -p1 export CFLAGS="${CFLAGS} -D__TIZEN_PATCH__ -D__BROADCOM_PATCH__" %reconfigure --disable-static \ diff --git a/packaging/install-more-binary-test.patch b/packaging/install-more-binary-test.patch deleted file mode 100644 index 6a982e7..0000000 --- a/packaging/install-more-binary-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/Makefile.tools 2011-07-11 15:24:40.506542027 +0800 -+++ new/Makefile.tools 2011-07-11 15:26:50.141636589 +0800 -@@ -151,7 +151,7 @@ - - bin_PROGRAMS += test/l2test test/rctest - --noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \ -+bin_PROGRAMS += test/gaptest test/sdptest test/scotest \ - test/attest test/hstest test/avtest test/ipctest \ - test/lmptest test/bdaddr test/agent \ - test/btiotest test/test-textfile \ diff --git a/packaging/install-test-scripts.patch b/packaging/install-test-scripts.patch deleted file mode 100644 index a3cad7b..0000000 --- a/packaging/install-test-scripts.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- old/Makefile.am 2011-07-11 14:58:11.468606842 +0800 -+++ new/Makefile.am 2011-07-11 15:21:42.593537802 +0800 -@@ -367,6 +367,30 @@ - EXTRA_DIST += scripts/bluetooth.rules \ - scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules - -+test_scripts = test/apitest \ -+ test/hsplay \ -+ test/hsmicro \ -+ test/list-devices \ -+ test/monitor-bluetooth \ -+ test/simple-agent \ -+ test/simple-service \ -+ test/test-adapter \ -+ test/test-audio \ -+ test/test-device \ -+ test/test-discovery \ -+ test/test-input \ -+ test/test-manager \ -+ test/test-network \ -+ test/test-serial \ -+ test/test-service \ -+ test/test-telephony -+ -+ -+if TEST -+testdir = ${pkglibdir}/test -+test_SCRIPTS = ${test_scripts} -+endif -+ - EXTRA_DIST += doc/manager-api.txt \ - doc/adapter-api.txt doc/device-api.txt \ - doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \ -- 2.7.4