<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21966">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tweak handover_tests.sh<br><br>We decided not to keep the handover_test script expected outputs<br>(osmo-bsc's logging output) in the source tree. Hence do not fail the<br>handover_tests when the output differs, just show a diff (if at all).<br><br>Change-Id: I3e9e123b41be71d1fcd9576b0bd38d2fd32353b4<br>---<br>M tests/handover/handover_tests.sh<br>1 file changed, 11 insertions(+), 18 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/66/21966/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/handover/handover_tests.sh b/tests/handover/handover_tests.sh</span><br><span>index 68a8e2d..240b789 100755</span><br><span>--- a/tests/handover/handover_tests.sh</span><br><span>+++ b/tests/handover/handover_tests.sh</span><br><span>@@ -19,24 +19,17 @@</span><br><span>        set +e</span><br><span>       "$build_dir"/handover_test "$test_path" > "$got_out" 2> "$got_err"</span><br><span>     rc=$?</span><br><span style="color: hsl(0, 100%, 40%);">-   if [ "x$rc" = "x0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-          expect_out="$test_path.ok"</span><br><span style="color: hsl(0, 100%, 40%);">-            expect_err="$test_path.err"</span><br><span style="color: hsl(0, 100%, 40%);">-           if [ "x$update" = "x-u" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-                     cp "$got_out" "$expect_out"</span><br><span style="color: hsl(0, 100%, 40%);">-                 cp "$got_err" "$expect_err"</span><br><span style="color: hsl(0, 100%, 40%);">-         else</span><br><span style="color: hsl(0, 100%, 40%);">-                    if [ -f "$expect_out" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-                         diff -u "$expect_out" "$got_out"</span><br><span style="color: hsl(0, 100%, 40%);">-                            rc=$?</span><br><span style="color: hsl(0, 100%, 40%);">-                   fi</span><br><span style="color: hsl(0, 100%, 40%);">-                      if [ -f "$expect_err" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-                         diff -u "$expect_err" "$got_err"</span><br><span style="color: hsl(0, 100%, 40%);">-                            rc2=$?</span><br><span style="color: hsl(0, 100%, 40%);">-                  fi</span><br><span style="color: hsl(0, 100%, 40%);">-                      if [ "x$rc" = "x0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-                          rc=$rc2</span><br><span style="color: hsl(0, 100%, 40%);">-                 fi</span><br><span style="color: hsl(120, 100%, 40%);">+    expect_out="$test_path.ok"</span><br><span style="color: hsl(120, 100%, 40%);">+  expect_err="$test_path.err"</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "x$rc" = "x0" -a  "x$update" = "x-u" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+             cp "$got_out" "$expect_out"</span><br><span style="color: hsl(120, 100%, 40%);">+               cp "$got_err" "$expect_err"</span><br><span style="color: hsl(120, 100%, 40%);">+       else</span><br><span style="color: hsl(120, 100%, 40%);">+          if [ -f "$expect_out" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                       diff -u "$expect_out" "$got_out" >&2</span><br><span style="color: hsl(120, 100%, 40%);">+               fi</span><br><span style="color: hsl(120, 100%, 40%);">+            if [ -f "$expect_err" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                       diff -u "$expect_err" "$got_err" >&2</span><br><span>              fi</span><br><span>   fi</span><br><span>   rm "$got_out"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21966">change 21966</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/+/21966"/><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: I3e9e123b41be71d1fcd9576b0bd38d2fd32353b4 </div>
<div style="display:none"> Gerrit-Change-Number: 21966 </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>