From a7ec369a28c7676787eb4bcdfd41282f798f532f Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 29 Oct 2019 15:37:19 +0100 Subject: [PATCH] tests: only check IU configs if IU is enabled Fix vty tests that are failing since libosmocore change Ic225232fbfca49ba868427eaf898e1f6e34e1ca8. If OsmoMSC is built without IU support, it fails with "cs7-instance-iu" in the config. Change-Id: Ie56da9167badfd2399b566af91a345103f46c2a1 --- osmoappdesc.py | 11 +++++++---- tests/Makefile.am | 9 +++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/osmoappdesc.py b/osmoappdesc.py index 886c682a7..bd7fea30c 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -14,13 +14,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see +import os + app_configs = { - "msc": ["doc/examples/osmo-msc/osmo-msc.cfg", - "doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg", - "doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg", - ], + "msc": ["doc/examples/osmo-msc/osmo-msc.cfg"], } +if os.environ["IU"] == "1": + app_configs["msc"] += ["doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg", + "doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg"] + apps = [(4254, "src/osmo-msc/osmo-msc", "OsmoMSC", "msc"), ] diff --git a/tests/Makefile.am b/tests/Makefile.am index 1fad55288..27c12051b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -59,8 +59,13 @@ python-tests: $(BUILT_SOURCES) endif vty-python-test: $(BUILT_SOURCES) - osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v +if BUILD_IU + IU=1 osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + IU=1 osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v +else + IU=0 osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + IU=0 osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v +endif $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/sms.db