This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgfix make distcheck with python tests - bscs.config needed by the vty tests was not picked up as a dist file, because its suffix is not 'cfg'. Rename it, also indicating its relation to the vty tests: bscs-for-vty-tests.cfg. Apply this rename in vty_test_runner.py. - Remove restart counters after external tests, otherwise distcheck complains about uncleaned files. - Add contrib/ipa.py to EXTRA_DIST, hence add a Makefile.am to contrib/. Otherwise the python tests cannot find that dependency. Change-Id: I42b55cb1125099afc3a8e3f87c0e398426b2e2a9 --- M Makefile.am M configure.ac A contrib/Makefile.am R doc/examples/osmo-bsc_nat/bscs-for-vty-tests.cfg M doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg M tests/Makefile.am M tests/vty_test_runner.py 7 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/18/3318/3 diff --git a/Makefile.am b/Makefile.am index 31a54ea..4a1f65d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,7 @@ include \ src \ tests \ + contrib \ $(NULL) pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index ff51ccf..adae598 100644 --- a/configure.ac +++ b/configure.ac @@ -263,4 +263,5 @@ tests/nanobts_omlattr/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..db6d0f5 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = ipa.py diff --git a/doc/examples/osmo-bsc_nat/bscs.config b/doc/examples/osmo-bsc_nat/bscs-for-vty-tests.cfg similarity index 100% rename from doc/examples/osmo-bsc_nat/bscs.config rename to doc/examples/osmo-bsc_nat/bscs-for-vty-tests.cfg diff --git a/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg b/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg index 6b48e97..efbb64d 100644 --- a/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg +++ b/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg @@ -62,5 +62,5 @@ timeout ping 20 timeout pong 5 ip-dscp 0 - bscs-config-file bscs.config + bscs-config-file bscs-for-vty-tests.cfg access-list bla imsi-allow ^11$ diff --git a/tests/Makefile.am b/tests/Makefile.am index 9cbc1c1..72161ee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -87,7 +87,7 @@ if BUILD_SMPP $(PYTHON) $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v endif - rm -f $(top_builddir)/hlr.sqlite3 + rm -f $(top_builddir)/hlr.sqlite3 $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count else python-tests: $(BUILT_SOURCES) echo "Not running python-based tests (determined at configure-time)" diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 92775d5..7d84e21 100644 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -1220,7 +1220,7 @@ def nat_bsc_reload(x): x.vty.command("configure terminal") x.vty.command("nat") - x.vty.command("bscs-config-file bscs.config") + x.vty.command("bscs-config-file bscs-for-vty-tests.cfg") x.vty.command("end") def nat_msc_ip(x, ip, port): -- To view, visit https://gerrit.osmocom.org/3318 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I42b55cb1125099afc3a8e3f87c0e398426b2e2a9 Gerrit-PatchSet: 3 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>