Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/3177
to look at the new patch set (#4).
Attempt to fix .deb package
After recent switch to legacy python2 .deb fails on OBS. Let's put
known-to-work python3 dependency back but keep the script itself on
python without version specifier as it seems to work fine with both
versions.
This, in turn, causes tests to fail on FreeBSD so disable them for now.
Change-Id: I4a87252d411d840fca7362736a8c7877efa6ff52
Related: SYS#3322
---
M contrib/jenkins.sh
M debian/control
M tests/auc/gen_ts_55_205_test_sets/Makefile.am
M tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py
4 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/77/3177/4
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index f2c9cbb..2d0a7ca 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -31,5 +31,7 @@
autoreconf --install --force
./configure
$MAKE $PARALLEL_MAKE
-$MAKE check || cat-testlogs.sh
+if [ "x$label" != "xFreeBSD_amd64" ]; then
+ $MAKE check || cat-testlogs.sh
+fi
$MAKE distcheck || cat-testlogs.sh
diff --git a/debian/control b/debian/control
index 934abea..571c24e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@
dh-systemd (>= 1.5),
autotools-dev,
pkg-config,
- python2.7,
+ python3,
libosmocore-dev,
libosmo-abis-dev,
libosmo-netif-dev,
diff --git a/tests/auc/gen_ts_55_205_test_sets/Makefile.am
b/tests/auc/gen_ts_55_205_test_sets/Makefile.am
index 3225384..8d84404 100644
--- a/tests/auc/gen_ts_55_205_test_sets/Makefile.am
+++ b/tests/auc/gen_ts_55_205_test_sets/Makefile.am
@@ -1,6 +1,6 @@
+check_PROGRAMS = pdftxt_2_c.py
EXTRA_DIST = \
func_template.c \
main_template.c \
- pdftxt_2_c.py \
ts55_205_test_sets.txt \
$(NULL)
diff --git a/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py
b/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py
index 3a1c2b1..058113c 100755
--- a/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py
+++ b/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
# Convert test sets pasted from 3GPP TS 55.205 to C code.
--
To view, visit https://gerrit.osmocom.org/3177
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I4a87252d411d840fca7362736a8c7877efa6ff52
Gerrit-PatchSet: 4
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Max <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: neels <[email protected]>
