<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/15895">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: only check IU configs if IU is enabled<br><br>Fix vty tests that are failing since libosmocore change<br>Ic225232fbfca49ba868427eaf898e1f6e34e1ca8. If OsmoMSC is built without<br>IU support, it fails with "cs7-instance-iu" in the config.<br><br>Change-Id: Ie56da9167badfd2399b566af91a345103f46c2a1<br>---<br>M osmoappdesc.py<br>M tests/Makefile.am<br>2 files changed, 14 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmoappdesc.py b/osmoappdesc.py</span><br><span>index 886c682..bd7fea3 100644</span><br><span>--- a/osmoappdesc.py</span><br><span>+++ b/osmoappdesc.py</span><br><span>@@ -14,13 +14,16 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program.  If not, see <http://www.gnu.org/licenses/></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import os</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> app_configs = {</span><br><span style="color: hsl(0, 100%, 40%);">-    "msc": ["doc/examples/osmo-msc/osmo-msc.cfg",</span><br><span style="color: hsl(0, 100%, 40%);">-            "doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg",</span><br><span style="color: hsl(0, 100%, 40%);">-            "doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg",</span><br><span style="color: hsl(0, 100%, 40%);">-      ],</span><br><span style="color: hsl(120, 100%, 40%);">+    "msc": ["doc/examples/osmo-msc/osmo-msc.cfg"],</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if os.environ["IU"] == "1":</span><br><span style="color: hsl(120, 100%, 40%);">+    app_configs["msc"] += ["doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg",</span><br><span style="color: hsl(120, 100%, 40%);">+                           "doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg"]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> apps = [(4254, "src/osmo-msc/osmo-msc", "OsmoMSC", "msc"),</span><br><span>         ]</span><br><span> </span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index 1fad552..27c1205 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -59,8 +59,13 @@</span><br><span> endif</span><br><span> </span><br><span> vty-python-test: $(BUILT_SOURCES)</span><br><span style="color: hsl(0, 100%, 40%);">-  osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v</span><br><span style="color: hsl(0, 100%, 40%);">-   osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+ IU=1 osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v</span><br><span style="color: hsl(120, 100%, 40%);">+    IU=1 osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+   IU=0 osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v</span><br><span style="color: hsl(120, 100%, 40%);">+    IU=0 osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>         $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v</span><br><span>       rm -f $(top_builddir)/sms.db</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/15895">change 15895</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-msc/+/15895"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie56da9167badfd2399b566af91a345103f46c2a1 </div>
<div style="display:none"> Gerrit-Change-Number: 15895 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>