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/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15895 ) Change subject: tests: only check IU configs if IU is enabled ...................................................................... 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 --- M osmoappdesc.py M tests/Makefile.am 2 files changed, 14 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmoappdesc.py b/osmoappdesc.py index 886c682..bd7fea3 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 <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"), ] diff --git a/tests/Makefile.am b/tests/Makefile.am index 1fad552..27c1205 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -59,8 +59,13 @@ 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 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie56da9167badfd2399b566af91a345103f46c2a1 Gerrit-Change-Number: 15895 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191029/04cc0188/attachment.htm>