<p>Hoernchen would like Ruben Undheim to <strong>review</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/14805">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix test for return codes on mipsel and alpha archs<br><br>Change-Id: Ia64f1d9f39fe2b1fb704f7b6c4d9cce93ab708cd<br>---<br>M tests/db/db_test.c<br>M tests/db/db_test.err<br>2 files changed, 27 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/14805/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/db/db_test.c b/tests/db/db_test.c</span><br><span>index fdd62c5..1243cab 100644</span><br><span>--- a/tests/db/db_test.c</span><br><span>+++ b/tests/db/db_test.c</span><br><span>@@ -51,7 +51,12 @@</span><br><span> * The return code is then available in g_rc. */</span><br><span> #define ASSERT_RC(call, expect_rc) \</span><br><span> do { \</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, #call " --> " #expect_rc "\n"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((expect_rc) == -ENOKEY) \</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, #call " --> -ENOKEY\n"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((expect_rc) == -ENOTSUP) \</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, #call " --> -ENOTSUP\n"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ else \</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, #call " --> " #expect_rc "\n"); \</span><br><span> g_rc = call; \</span><br><span> if (g_rc != (expect_rc)) \</span><br><span> fprintf(stderr, " MISMATCH: got rc = %d, expected: " \</span><br><span>@@ -67,7 +72,12 @@</span><br><span> do { \</span><br><span> int rc; \</span><br><span> fill_invalid(g_subscr); \</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "db_subscr_get_by_" #by "(dbc, " #val ", &g_subscr) --> " \</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((expect_rc) == -ENOKEY) \</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "db_subscr_get_by_" #by "(dbc, " #val ", &g_subscr) --> -ENOKEY \n"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((expect_rc) == -ENOTSUP) \</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "db_subscr_get_by_" #by "(dbc, " #val ", &g_subscr) --> -ENOTSUP \n"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ else \</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "db_subscr_get_by_" #by "(dbc, " #val ", &g_subscr) --> " \</span><br><span> #expect_rc "\n"); \</span><br><span> rc = db_subscr_get_by_##by(dbc, val, &g_subscr); \</span><br><span> if (rc != (expect_rc)) \</span><br><span>diff --git a/tests/db/db_test.err b/tests/db/db_test.err</span><br><span>index 4dc77e8..98546ce 100644</span><br><span>--- a/tests/db/db_test.err</span><br><span>+++ b/tests/db/db_test.err</span><br><span>@@ -828,12 +828,12 @@</span><br><span> .imsi = '123456789000000',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span>@@ -910,12 +910,12 @@</span><br><span> </span><br><span> db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, NULL)) --> 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span>@@ -935,12 +935,12 @@</span><br><span> </span><br><span> db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, "f000000000000f00000000000f000000")) --> 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span>@@ -1037,12 +1037,12 @@</span><br><span> </span><br><span> db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_NONE, NULL, false, NULL, 0)) --> 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span>@@ -1072,12 +1072,12 @@</span><br><span> </span><br><span> db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_NONE, "asdfasdfasd", false, "asdfasdfasdf", 99999)) --> 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span>@@ -1318,12 +1318,12 @@</span><br><span> .imsi = '123456789000000',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span>@@ -1365,7 +1365,7 @@</span><br><span> .imsi = '123456789000000',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span>@@ -1376,7 +1376,7 @@</span><br><span> db_update_sqn(dbc, id, 123) --> -ENOENT</span><br><span> DAUC Cannot update SQN for subscriber ID=1: no auc_3g entry for such subscriber</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span>@@ -1384,7 +1384,7 @@</span><br><span> db_update_sqn(dbc, id, 543) --> -ENOENT</span><br><span> DAUC Cannot update SQN for subscriber ID=1: no auc_3g entry for such subscriber</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126</span><br><span style="color: hsl(120, 100%, 40%);">+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -ENOKEY</span><br><span> DAUC IMSI='123456789000000': No 2G Auth Data</span><br><span> DAUC IMSI='123456789000000': No 3G Auth Data</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/14805">change 14805</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-hlr/+/14805"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia64f1d9f39fe2b1fb704f7b6c4d9cce93ab708cd </div>
<div style="display:none"> Gerrit-Change-Number: 14805 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Ruben Undheim <ruben.undheim@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>