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
This commit is contained in:
Oliver Smith 2019-10-29 15:37:19 +01:00
parent 467bb87f44
commit a7ec369a28
2 changed files with 14 additions and 6 deletions

View File

@ -14,13 +14,16 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>
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"),
]

View File

@ -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