aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-07-20 17:57:37 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2017-08-27 17:40:52 +0200
commita4cd7f88ae6ba6cac4784bea03a7ec47abe8c764 (patch)
tree9457626782a2da8b28b744be66269f3522f82415
parentd287114512d44bf1034af97b9eb7b0582031d067 (diff)
fix 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 to *.cfg. Apply this rename in vty_test_runner.py and osmo-bsc_nat.cfg. - 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
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac1
-rw-r--r--contrib/Makefile.am1
-rw-r--r--doc/examples/osmo-bsc_nat/bscs.cfg (renamed from doc/examples/osmo-bsc_nat/bscs.config)0
-rw-r--r--doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg2
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/vty_test_runner.py2
7 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 31a54ea..4a1f65d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ SUBDIRS = \
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 @@ AC_OUTPUT(
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.cfg
index 176debe..176debe 100644
--- a/doc/examples/osmo-bsc_nat/bscs.config
+++ b/doc/examples/osmo-bsc_nat/bscs.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..e835e06 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 @@ nat
timeout ping 20
timeout pong 5
ip-dscp 0
- bscs-config-file bscs.config
+ bscs-config-file bscs.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 @@ python-tests: $(BUILT_SOURCES)
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..68a697d 100644
--- a/tests/vty_test_runner.py
+++ b/tests/vty_test_runner.py
@@ -1220,7 +1220,7 @@ def add_nat_test(suite, workdir):
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.cfg")
x.vty.command("end")
def nat_msc_ip(x, ip, port):