[libosmocore] 02/03: merge patched into master

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository libosmocore.

commit 015cfe32587c5569dcc2f0823d16dca5460cc40e
Merge: 6bc5ba0 7ed79b4
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Wed Nov 2 22:51:27 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 debian/patches/0006-Disable-unreliable-tests.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/testsuite.at                                 | 12 ---------
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --cc debian/.git-dpm
index 821425a,0000000..9ab1ba0
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 28017114dd63502dc7e87d07bd45d473ed3178b9
- 28017114dd63502dc7e87d07bd45d473ed3178b9
++7ed79b49586809c881f3e11351dc1e2dea0a96f4
++7ed79b49586809c881f3e11351dc1e2dea0a96f4
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +libosmocore_0.9.0.orig.tar.gz
 +705eca7a77d295fcaf08ed4c3d0feb8b696fe914
 +574737
diff --cc debian/patches/0006-Disable-unreliable-tests.patch
index 0000000,0000000..c3aaa4f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-Disable-unreliable-tests.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 7ed79b49586809c881f3e11351dc1e2dea0a96f4 Mon Sep 17 00:00:00 2001
++From: Santiago Vila <sanvila at debian.org>
++Date: Wed, 2 Nov 2016 22:50:19 +0100
++Subject: Disable unreliable tests
++
++Change-Id: I8307b4577f77b947de5eeba80ea36e9710ac1cfd
++---
++ tests/testsuite.at | 12 ------------
++ 1 file changed, 12 deletions(-)
++
++diff --git a/tests/testsuite.at b/tests/testsuite.at
++index a542798..d8482e9 100644
++--- a/tests/testsuite.at
+++++ b/tests/testsuite.at
++@@ -142,15 +142,3 @@ cat $abs_srcdir/stats/stats_test.ok > expout
++ AT_CHECK([$abs_top_builddir/tests/stats/stats_test], [0], [expout], [ignore])
++ AT_CLEANUP
++ 
++-AT_SETUP([bssgp-fc])
++-AT_KEYWORDS([bssgp-fc])
++-cat $abs_srcdir/gb/bssgp_fc_tests.ok > expout
++-cat $abs_srcdir/gb/bssgp_fc_tests.err > experr
++-AT_CHECK([$abs_top_srcdir/tests/gb/bssgp_fc_tests.sh $abs_top_builddir/tests/gb], [0], [expout], [experr])
++-AT_CLEANUP
++-
++-AT_SETUP([timer])
++-AT_KEYWORDS([timer])
++-cat $abs_srcdir/timer/timer_test.ok > expout
++-AT_CHECK([$abs_top_builddir/tests/timer/timer_test -s 5], [0], [expout], [ignore])
++-AT_CLEANUP
diff --cc debian/patches/series
index 7ed4cf3,0ca407b..1284ac9
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,1 +1,6 @@@
 -debian-changes-0.1.17-1
 +0001-Removed-illegal-pkg-config-directive.patch
 +0002-Some-spelling-errors-corrected.patch
 +0003-Setting-library-version-explicitly.patch
 +0004-Patched-structs-for-big-endian-architectures.patch
 +0005-Set-HTML_TIMESTAMP-to-NO-to-make-build-reproducible.patch
++0006-Disable-unreliable-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libosmocore.git