diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | contrib/Makefile.am | 1 | ||||
| -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.cfg | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/vty_test_runner.py | 2 |
7 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 31a54ea06..4a1f65ddd 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 ff51ccfcf..adae598ac 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 000000000..db6d0f536 --- /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 176debe42..176debe42 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 6b48e970e..e835e068a 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 9cbc1c172..72161eeea 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 92775d5b7..68a697d78 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): |