From f9c3da9d74737972d783e0cade4f92c1f2a71b13 Mon Sep 17 00:00:00 2001 From: Wu Zheng Date: Wed, 20 Mar 2013 11:32:14 +0800 Subject: [PATCH] TIVI-319 [2.0] no bluez-test found in repo --- Makefile.am | 20 ++++++++++++++++++++ packaging/bluez.spec | 5 +++++ test/simple-agent | 4 ++-- test/test-device | 4 ++-- test/test-discovery | 4 ++-- test/test-manager | 4 ++-- 6 files changed, 33 insertions(+), 8 deletions(-) mode change 100755 => 100644 test/test-device mode change 100755 => 100644 test/test-discovery mode change 100755 => 100644 test/test-manager diff --git a/Makefile.am b/Makefile.am index ecbe335..a4f87ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -418,6 +418,26 @@ CLEANFILES += $(rules_DATA) EXTRA_DIST += scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules +test_scripts = 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 + +testdir = ${pkglibdir}/test +test_SCRIPTS = ${test_scripts} + 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/packaging/bluez.spec b/packaging/bluez.spec index 76bbe02..02d35ac 100644 --- a/packaging/bluez.spec +++ b/packaging/bluez.spec @@ -54,6 +54,10 @@ use in Bluetooth applications. %package -n bluez-test Summary: Test utilities for BlueZ Group: Test Utilities +Requires: %{name} = %{version}-%{release} +Requires: dbus-python +Requires: pygobject +Requires: python-xml %description -n bluez-test bluez-test contains test utilities for BlueZ testing. @@ -158,3 +162,4 @@ ln -s bluetooth.service %{buildroot}%{_libdir}/systemd/system/dbus-org.bluez.ser %{_sbindir}/hciemu %{_bindir}/l2test %{_bindir}/rctest +%{_libdir}/bluez/test/* diff --git a/test/simple-agent b/test/simple-agent index a25eaf0..a089cbc 100644 --- a/test/simple-agent +++ b/test/simple-agent @@ -2,7 +2,7 @@ from __future__ import absolute_import, print_function, unicode_literals -from gi.repository import GObject +import gobject import sys import dbus @@ -122,7 +122,7 @@ if __name__ == '__main__': path = "/test/agent" agent = Agent(bus, path) - mainloop = GObject.MainLoop() + mainloop = gobject.MainLoop() if len(args) > 1: if len(args) > 2: diff --git a/test/test-device b/test/test-device old mode 100755 new mode 100644 index 81a44f8..32bcfba --- a/test/test-device +++ b/test/test-device @@ -2,7 +2,7 @@ from __future__ import absolute_import, print_function, unicode_literals -from gi.repository import GObject +import gobject import sys import dbus @@ -12,7 +12,7 @@ from optparse import OptionParser, make_option dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) bus = dbus.SystemBus() -mainloop = GObject.MainLoop() +mainloop = gobject.MainLoop() manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager") diff --git a/test/test-discovery b/test/test-discovery old mode 100755 new mode 100644 index 269c51c..43ee072 --- a/test/test-discovery +++ b/test/test-discovery @@ -2,7 +2,7 @@ from __future__ import absolute_import, print_function, unicode_literals -from gi.repository import GObject +import gobject import dbus import dbus.mainloop.glib @@ -59,5 +59,5 @@ if __name__ == '__main__': adapter.StartDiscovery() - mainloop = GObject.MainLoop() + mainloop = gobject.MainLoop() mainloop.run() diff --git a/test/test-manager b/test/test-manager old mode 100755 new mode 100644 index 8a7e2f6..321adf8 --- a/test/test-manager +++ b/test/test-manager @@ -2,7 +2,7 @@ from __future__ import absolute_import, print_function, unicode_literals -from gi.repository import GObject +import gobject import dbus import dbus.mainloop.glib @@ -36,5 +36,5 @@ if __name__ == "__main__": except: pass - mainloop = GObject.MainLoop() + mainloop = gobject.MainLoop() mainloop.run() -- 2.7.4