[openbsc] 01/01: Fixed failing test

Ruben Undheim rubund-guest at moszumanska.debian.org
Wed Feb 10 22:02:10 UTC 2016


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

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

commit c07ae62fddc762c1bfe7e9da2fec98371c965ab1
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Wed Feb 10 23:01:59 2016 +0100

    Fixed failing test
---
 debian/patches/fix_failing_test.patch      | 48 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  2 +-
 debian/patches/temporarily_skip_test.patch | 14 ---------
 3 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/debian/patches/fix_failing_test.patch b/debian/patches/fix_failing_test.patch
new file mode 100644
index 0000000..77af4f6
--- /dev/null
+++ b/debian/patches/fix_failing_test.patch
@@ -0,0 +1,48 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openbsc (0.15.0-1) UNRELEASED; urgency=low
+ .
+   * Initial release (Closes: #806583)
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+Bug-Debian: https://bugs.debian.org/806583
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openbsc-0.15.0.orig/openbsc/src/gprs/gprs_sgsn.c
++++ openbsc-0.15.0/openbsc/src/gprs/gprs_sgsn.c
+@@ -41,8 +41,6 @@
+ 
+ #include <time.h>
+ 
+-#include <openssl/rand.h>
+-
+ #define GPRS_LLME_CHECK_TICK 30
+ 
+ extern struct sgsn_instance *sgsn;
+@@ -527,9 +525,8 @@ uint32_t sgsn_alloc_ptmsi(void)
+ 	int max_retries = 100;
+ 
+ restart:
+-	if (RAND_bytes((uint8_t *) &ptmsi, sizeof(ptmsi)) != 1)
+-		goto failed;
+ 
++	ptmsi = rand();
+ 	/* Enforce that the 2 MSB are set without loosing the distance between
+ 	 * identical values. Since rand() has no duplicate values within a
+ 	 * period (because the size of the state is the same like the size of
diff --git a/debian/patches/series b/debian/patches/series
index 807328b..36c6aa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 fix_include_dir.patch
-temporarily_skip_test.patch
 set_version_explicitly.patch
 correct_spelling_errors.patch
+fix_failing_test.patch
diff --git a/debian/patches/temporarily_skip_test.patch b/debian/patches/temporarily_skip_test.patch
deleted file mode 100644
index 6317558..0000000
--- a/debian/patches/temporarily_skip_test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: openbsc/openbsc/tests/testsuite.at
-===================================================================
---- openbsc.orig/openbsc/tests/testsuite.at	2016-02-07 15:23:29.019875246 +0100
-+++ openbsc/openbsc/tests/testsuite.at	2016-02-07 16:10:34.705740376 +0100
-@@ -97,9 +97,3 @@
- AT_CHECK([$abs_top_builddir/tests/trau/trau_test], [], [expout], [ignore])
- AT_CLEANUP
- 
--AT_SETUP([sgsn])
--AT_KEYWORDS([sgsn])
--AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
--cat $abs_srcdir/sgsn/sgsn_test.ok > expout
--AT_CHECK([$abs_top_builddir/tests/sgsn/sgsn_test], [], [expout], [ignore])
--AT_CLEANUP

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



More information about the debian-science-commits mailing list