<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21206">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">speed up vty tests: add --fast-shutdown option to osmo-bsc<br><br>Change-Id: I506349c532b13751f674e4b9a132219d823f19e1<br>---<br>M src/osmo-bsc/osmo_bsc_main.c<br>M tests/Makefile.am<br>M tests/vty_test_runner.py<br>3 files changed, 10 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/21206/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index aa45bf0..39fd616 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -88,6 +88,7 @@</span><br><span> static const char *config_file = "osmo-bsc.cfg";</span><br><span> static const char *rf_ctrl = NULL;</span><br><span> static int daemonize = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+static bool fast_shutdown = false;</span><br><span> </span><br><span> static void print_usage()</span><br><span> {</span><br><span>@@ -108,6 +109,7 @@</span><br><span> printf(" -e --log-level number Set a global loglevel.\n");</span><br><span> printf(" -r --rf-ctl NAME A unix domain socket to listen for cmds.\n");</span><br><span> printf(" -t --testmode A special mode to provoke failures at the MSC.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" --fast-shutdown Omit shutdown delay, for rapid testing purposes.\n");</span><br><span> </span><br><span> printf("\nVTY reference generation:\n");</span><br><span> printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n");</span><br><span>@@ -133,6 +135,9 @@</span><br><span> get_value_string(vty_ref_gen_mode_desc, vty_ref_mode));</span><br><span> vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode);</span><br><span> exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ case 3:</span><br><span style="color: hsl(120, 100%, 40%);">+ fast_shutdown = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> fprintf(stderr, "%s: error parsing cmdline options\n", prog_name);</span><br><span> exit(2);</span><br><span>@@ -158,6 +163,7 @@</span><br><span> {"testmode", 0, 0, 't'},</span><br><span> {"vty-ref-mode", 1, &long_option, 1},</span><br><span> {"vty-ref-xml", 0, &long_option, 2},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"fast-shutdown", 0, &long_option, 3},</span><br><span> {0, 0, 0, 0}</span><br><span> };</span><br><span> </span><br><span>@@ -691,7 +697,8 @@</span><br><span> case SIGTERM:</span><br><span> bsc_shutdown_net(bsc_gsmnet);</span><br><span> osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- sleep(3);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!fast_shutdown)</span><br><span style="color: hsl(120, 100%, 40%);">+ sleep(3);</span><br><span> exit(0);</span><br><span> break;</span><br><span> case SIGABRT:</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index c061baa..1493ac2 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -70,7 +70,7 @@</span><br><span> vty-test:</span><br><span> osmo_verify_transcript_vty.py -v \</span><br><span> -n OsmoBSC -p 4242 \</span><br><span style="color: hsl(0, 100%, 40%);">- -r "$(top_builddir)/src/osmo-bsc/osmo-bsc -c $(top_srcdir)/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -r "$(top_builddir)/src/osmo-bsc/osmo-bsc --fast-shutdown -c $(top_srcdir)/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg" \</span><br><span> $(U) $(srcdir)/$(VTY_TEST)</span><br><span> </span><br><span> check-local: atconfig $(TESTSUITE)</span><br><span>diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py</span><br><span>index 34ddcc7..172b14e 100755</span><br><span>--- a/tests/vty_test_runner.py</span><br><span>+++ b/tests/vty_test_runner.py</span><br><span>@@ -108,7 +108,7 @@</span><br><span> class TestVTYBSC(TestVTYGenericBSC):</span><br><span> </span><br><span> def vty_command(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return ["./src/osmo-bsc/osmo-bsc", "-c",</span><br><span style="color: hsl(120, 100%, 40%);">+ return ["./src/osmo-bsc/osmo-bsc", "--fast-shutdown", "-c",</span><br><span> "doc/examples/osmo-bsc/osmo-bsc.cfg"]</span><br><span> </span><br><span> def vty_app(self):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21206">change 21206</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-bsc/+/21206"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I506349c532b13751f674e4b9a132219d823f19e1 </div>
<div style="display:none"> Gerrit-Change-Number: 21206 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>