<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14140">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: Mute stdout during db_prepare()<br><br>libdbi on debian unstable (at least)<br>outputs: "no table in statement !"<br>breaking the db_test.<br><br>Redirect stdout to /dev/null and restore<br>after the function completes.<br><br>Closes OS#4016<br><br>Change-Id: I8227aa8fa44d3237019db52dd0825f827797261b<br>---<br>M openbsc/tests/db/db_test.c<br>1 file changed, 21 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c</span><br><span>index 755a6e9..5167185 100644</span><br><span>--- a/openbsc/tests/db/db_test.c</span><br><span>+++ b/openbsc/tests/db/db_test.c</span><br><span>@@ -30,6 +30,7 @@</span><br><span> #include <stdlib.h></span><br><span> #include <stdbool.h></span><br><span> #include <inttypes.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span> </span><br><span> static struct gsm_network dummy_net;</span><br><span> static struct gsm_subscriber_group dummy_sgrp;</span><br><span>@@ -208,6 +209,8 @@</span><br><span> </span><br><span>  dummy_net.subscr_group = &dummy_sgrp;</span><br><span>    dummy_sgrp.net         = &dummy_net;</span><br><span style="color: hsl(120, 100%, 40%);">+      int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+       fpos_t pos;</span><br><span> </span><br><span>      if (db_init("hlr.sqlite3")) {</span><br><span>              printf("DB: Failed to init database. Please check the option settings.\n");</span><br><span>@@ -215,10 +218,27 @@</span><br><span>        }        </span><br><span>    printf("DB: Database initialized.\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    if (db_prepare()) {</span><br><span style="color: hsl(120, 100%, 40%);">+   /* Muting stdout here because libdbi</span><br><span style="color: hsl(120, 100%, 40%);">+   * may output noise on some platforms */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    fflush(stdout);</span><br><span style="color: hsl(120, 100%, 40%);">+       fgetpos(stdout, &pos);</span><br><span style="color: hsl(120, 100%, 40%);">+    int old_stdout = dup(fileno(stdout));</span><br><span style="color: hsl(120, 100%, 40%);">+ freopen("/dev/null", "w", stdout);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      rc = db_prepare();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  fflush(stdout);</span><br><span style="color: hsl(120, 100%, 40%);">+       dup2(old_stdout, fileno(stdout));</span><br><span style="color: hsl(120, 100%, 40%);">+     close(old_stdout);</span><br><span style="color: hsl(120, 100%, 40%);">+    clearerr(stdout);</span><br><span style="color: hsl(120, 100%, 40%);">+     fsetpos(stdout, &pos);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  if (rc) {</span><br><span>            printf("DB: Failed to prepare database.\n");</span><br><span>               return 1;</span><br><span>    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  printf("DB: Database prepared.\n");</span><br><span> </span><br><span>    struct gsm_subscriber *alice = NULL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14140">change 14140</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/14140"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8227aa8fa44d3237019db52dd0825f827797261b </div>
<div style="display:none"> Gerrit-Change-Number: 14140 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Keith Whyte <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>