<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21984">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test: vty echo<br><br>Echo each handover_test command on the test output, to help with<br>understanding the exact point of a test failure.<br><br>Even nicer would be a general echo of all VTY commands, but the VTY<br>currently does not support that feature. Refraining from a libosmocore<br>patch just for these test scripts...<br><br>Change-Id: Ifc307a7d0b7e3caa355f8cee88778762b529ad71<br>---<br>M tests/handover/handover_test.c<br>1 file changed, 22 insertions(+), 0 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/84/21984/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 167f1ce..d422a9d 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -741,6 +741,11 @@</span><br><span> return &ts->lchan[atoi(argv[3])];</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int vty_step = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define VTY_ECHO() \</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "\n%d: %s\n", vty_step++, vty->buf)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define TS_USE " (TCH/F|TCH/H-|TCH/-H|TCH/HH|PDCH" \</span><br><span> "|tch/f|tch/h-|tch/-h|tch/hh|pdch" \</span><br><span> "|-|*)"</span><br><span>@@ -764,6 +769,7 @@</span><br><span> {</span><br><span> int i;</span><br><span> int n = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> for (i = 0; i < n; i++)</span><br><span> _create_bts(1, NULL, 0);</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -779,6 +785,7 @@</span><br><span> " shorthands: cs+4 = CCCH+SDCCH4; dyn = TCH/F_TCH/H_PDCH\n")</span><br><span> {</span><br><span> int num_trx = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> _create_bts(num_trx, argv + 1, argc - 1);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -794,6 +801,7 @@</span><br><span> const char *tch_type = argv[1];</span><br><span> const char *codec = argv[2];</span><br><span> struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> fprintf(stderr, "- Creating mobile at BTS %s on "</span><br><span> "%s with %s codec\n", bts_nr_str, tch_type, codec);</span><br><span> lchan = create_lchan(bts_by_num_str(bts_nr_str),</span><br><span>@@ -878,6 +886,7 @@</span><br><span> "meas-rep " MEAS_REP_ARGS,</span><br><span> MEAS_REP_DOC MEAS_REP_ARGS_DOC)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> return _meas_rep(vty, argc, argv);</span><br><span> }</span><br><span> </span><br><span>@@ -888,6 +897,7 @@</span><br><span> MEAS_REP_ARGS_DOC)</span><br><span> {</span><br><span> int count = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> argv += 1;</span><br><span> argc -= 1;</span><br><span> </span><br><span>@@ -900,6 +910,7 @@</span><br><span> "congestion-check",</span><br><span> "Trigger a congestion check\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> fprintf(stderr, "- Triggering congestion check\n");</span><br><span> hodec2_congestion_check(bsc_gsmnet);</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -909,6 +920,7 @@</span><br><span> "expect-no-chan",</span><br><span> "Expect that no channel request was sent from BSC to any cell\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> fprintf(stderr, "- Expecting no channel request\n");</span><br><span> if (new_chan_req) {</span><br><span> fprintf(stderr, " * Got channel request at %s\n", gsm_lchan_name(new_chan_req));</span><br><span>@@ -962,6 +974,7 @@</span><br><span> "Expect a channel request from BSC to a cell for a specific lchan\n"</span><br><span> LCHAN_ARGS_DOC)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> _expect_chan_activ(parse_lchan_args(argv));</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -971,6 +984,7 @@</span><br><span> "Expect a handover of a given lchan\n"</span><br><span> LCHAN_ARGS_DOC)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> _expect_ho_req(parse_lchan_args(argv));</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -979,6 +993,7 @@</span><br><span> "ho-detect",</span><br><span> "Send Handover Detection to the most recent HO target lchan\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> if (!last_chan_req) {</span><br><span> fprintf(stderr, "Cannot ack handover/assignment, because no chan request\n");</span><br><span> exit(1);</span><br><span>@@ -991,6 +1006,7 @@</span><br><span> "ho-complete",</span><br><span> "Send Handover Complete for the most recent HO target lchan\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> if (!last_chan_req) {</span><br><span> fprintf(stderr, "Cannot ack handover/assignment, because no chan request\n");</span><br><span> exit(1);</span><br><span>@@ -1013,6 +1029,7 @@</span><br><span> {</span><br><span> struct gsm_lchan *from = parse_lchan_args(argv);</span><br><span> struct gsm_lchan *to = parse_lchan_args(argv+4);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> </span><br><span> _expect_chan_activ(to);</span><br><span> _expect_ho_req(from);</span><br><span>@@ -1026,6 +1043,7 @@</span><br><span> "ho-failed",</span><br><span> "Fail the most recent handover request\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> if (!last_chan_req) {</span><br><span> fprintf(stderr, "Cannot fail handover, because no chan request\n");</span><br><span> exit(1);</span><br><span>@@ -1048,6 +1066,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = bts_by_num_str(argv[0]);</span><br><span> struct gsm_bts_trx *trx = trx_by_num_str(bts, argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> argv += 2;</span><br><span> argc -= 2;</span><br><span> if (!_expect_ts_use(bts, trx, argv))</span><br><span>@@ -1060,6 +1079,7 @@</span><br><span> "Define which codec should be used for new TCH/F lchans (for set-ts-use)\n"</span><br><span> "Configure the TCH/F codec to use\nAMR\nEFR\nFR\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> osmo_talloc_replace_string(ctx, &codec_tch_f, argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -1069,6 +1089,7 @@</span><br><span> "Define which codec should be used for new TCH/H lchans (for set-ts-use)\n"</span><br><span> "Configure the TCH/H codec to use\nAMR\nHR\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> osmo_talloc_replace_string(ctx, &codec_tch_h, argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -1082,6 +1103,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = bts_by_num_str(argv[0]);</span><br><span> struct gsm_bts_trx *trx = trx_by_num_str(bts, argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_ECHO();</span><br><span> argv += 2;</span><br><span> argc -= 2;</span><br><span> if (!_set_ts_use(bts, trx, argv))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21984">change 21984</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/+/21984"/><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: Ifc307a7d0b7e3caa355f8cee88778762b529ad71 </div>
<div style="display:none"> Gerrit-Change-Number: 21984 </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>