Accepting request 331118 from home:dimstar:Factory

Add bluez-no-duplicate-test-names.patch: Fix test suite when running against GLIB 2.45.x (test names are not to be used duplicated).    Sent the patch to upstream as well.

OBS-URL: https://build.opensuse.org/request/show/331118
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=197
This commit is contained in:
Stefan Seyfried 2015-09-16 08:38:17 +00:00 committed by Git OBS Bridge
parent 8122fe09c3
commit be5b628375
3 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,28 @@
From ff657211adeefe2700d686c2960fa19492f7a71d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 10 Sep 2015 15:32:31 +0200
Subject: [PATCH] tests: test-gobex-header: do not use the same full path for
two tests
Since GLib 2.45.7, it is no longer permitted to have two tests with the same full path.
Related glib commit: https://git.gnome.org/browse/glib/commit/glib/gtestutils.c?id=367f36d630afa01b0967547f5a038a1f8f499f45
---
unit/test-gobex-header.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unit/test-gobex-header.c b/unit/test-gobex-header.c
index 6f49312..8705892 100644
--- a/unit/test-gobex-header.c
+++ b/unit/test-gobex-header.c
@@ -554,7 +554,7 @@ int main(int argc, char *argv[])
test_header_encode_name_umlaut);
g_test_add_func("/gobex/test_header_encode_body",
test_header_encode_body);
- g_test_add_func("/gobex/test_header_encode_connid",
+ g_test_add_func("/gobex/test_header_encode_actionid",
test_header_encode_actionid);
g_test_add_func("/gobex/test_header_encode_apparam",
test_header_encode_apparam);
--
2.5.0

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 10 13:24:58 UTC 2015 - dimstar@opensuse.org
- Add bluez-no-duplicate-test-names.patch: Fix test suite when
running against GLIB 2.45.x (test names are not to be used
duplicated).
-------------------------------------------------------------------
Fri Sep 4 10:39:32 UTC 2015 - seife+obs@b1-systems.com

View File

@ -36,6 +36,8 @@ Source7: bluetooth.modprobe
# fix some logitech HID devices, bnc#681049, bnc#850478 --seife+obs@b1-systems.com
Patch1: bluez-5.11-logitech-hid2hci.patch
Patch2: bluez-sdp-unix-path.patch
# PATCH-FIX-UPSTREAM bluez-no-duplicate-test-names.patch dimstar@opensuse.org -- Do not re-use test names
Patch3: bluez-no-duplicate-test-names.patch
BuildRequires: alsa-devel
BuildRequires: automake
BuildRequires: check-devel
@ -111,6 +113,7 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
mkdir dbus-apis
cp -a doc/*.txt dbus-apis/
# FIXME: Change the dbus service to be a real service, not systemd launched