This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Max gerrit-no-reply at lists.osmocom.orgMax has uploaded this change for review. ( https://gerrit.osmocom.org/12271 Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Use msgb helper instead of local #define for debug print This change was made using following spatch program: @@ expression a, b, c; @@ - VERIFY(a, b, c); + if (!msgb_eq_l3_data_print(a, b, c)) + abort(); Which was applied as follows: spatch --in-place --sp-file verif.spatch tests/gsm0808/gsm0808_test.c Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b --- M tests/gsm0808/gsm0808_test.c 1 file changed, 62 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12271/1 diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 63b8720..a31e7d4 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -116,7 +116,8 @@ msgb_v_put(in_msg, 0x23); msg = gsm0808_create_layer3_2(in_msg, &cgi, NULL); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msgb_free(in_msg); } @@ -152,7 +153,8 @@ msg = gsm0808_create_layer3_2(in_msg, &cgi, &sc_list); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msgb_free(in_msg); @@ -165,7 +167,8 @@ printf("Testing creating Reset\n"); msg = gsm0808_create_reset(); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -176,7 +179,8 @@ printf("Testing creating Reset Ack\n"); msg = gsm0808_create_reset_ack(); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -188,7 +192,8 @@ printf("Testing creating Clear Command\n"); msg = gsm0808_create_clear_command(0x23); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -199,7 +204,8 @@ printf("Testing creating Clear Complete\n"); msg = gsm0808_create_clear_complete(); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -234,12 +240,14 @@ printf("Testing creating Chipher Mode Command\n"); msg = gsm0808_create_cipher(&ei, NULL); OSMO_ASSERT(msg); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msg = gsm0808_create_cipher(&ei, &include_imeisv); OSMO_ASSERT(msg); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -259,19 +267,22 @@ /* with l3 data */ msg = gsm0808_create_cipher_complete(l3, 4); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); /* with l3 data but short */ l3->len -= 1; l3->tail -= 1; msg = gsm0808_create_cipher_complete(l3, 4); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); /* without l3 data */ msg = gsm0808_create_cipher_complete(NULL, 4); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); @@ -308,7 +319,8 @@ printf("Testing creating Cipher Reject\n"); msg = gsm0808_create_cipher_reject(cause); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); parse_cipher_reject(msg, cause); @@ -323,7 +335,8 @@ printf("Testing creating Cipher Reject (extended)\n"); msg = gsm0808_create_cipher_reject_ext(GSM0808_CAUSE_CLASS_INVAL, cause); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); parse_cipher_reject(msg, cause); @@ -342,12 +355,14 @@ printf("Testing creating CM U\n"); msg = gsm0808_create_classmark_update(&cm2, 1, &cm3, 1); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msg = gsm0808_create_classmark_update(&cm2, 1, NULL, 0); - VERIFY(msg, res2o, ARRAY_SIZE(res2o)); + if (!msgb_eq_l3_data_print(msg, res2o, ARRAY_SIZE(res2o))) + abort(); msgb_free(msg); } @@ -359,7 +374,8 @@ printf("Testing creating SAPI Reject\n"); msg = gsm0808_create_sapi_reject(3); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -404,12 +420,14 @@ printf("Testing creating Assignment Request\n"); msg = gsm0808_create_ass(&ct, &cic, NULL, NULL, NULL); OSMO_ASSERT(msg); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); msg = gsm0808_create_ass(&ct, &cic, &ss, &sc_list, &call_id); OSMO_ASSERT(msg); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -424,11 +442,13 @@ printf("Testing creating Assignment Complete\n"); msg = gsm0808_create_assignment_completed(0x23, 0x42, 0x11, 0x22); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); msg = gsm0808_create_assignment_completed(0x23, 0x42, 0x11, 0); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -464,7 +484,8 @@ printf("Testing creating Assignment Complete (AoIP)\n"); msg = gsm0808_create_ass_compl(0x23, 0x42, 0x11, 0x22, &ss, &sc, &sc_list); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -478,11 +499,13 @@ printf("Testing creating Assignment Failure\n"); msg = gsm0808_create_assignment_failure(0x23, NULL); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); msg = gsm0808_create_assignment_failure(0x23, &rr_res); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -504,11 +527,13 @@ printf("Testing creating Assignment Failure (AoIP)\n"); msg = gsm0808_create_ass_fail(0x23, NULL, &sc_list); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); msg = gsm0808_create_ass_fail(0x23, &rr_res, &sc_list); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -519,7 +544,8 @@ printf("Testing creating Clear Request\n"); msg = gsm0808_create_clear_rqst(0x23); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -551,15 +577,18 @@ printf("Testing creating Paging Request\n"); msg = gsm0808_create_paging2(imsi, NULL, &cil, NULL); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msg = gsm0808_create_paging2(imsi, &tmsi, &cil, NULL); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); msg = gsm0808_create_paging2(imsi, &tmsi, &cil, &chan_needed); - VERIFY(msg, res3, ARRAY_SIZE(res3)); + if (!msgb_eq_l3_data_print(msg, res3, ARRAY_SIZE(res3))) + abort(); msgb_free(msg); } @@ -575,7 +604,8 @@ msgb_v_put(l3, 0x42); msg = gsm0808_create_dtap(l3, 0x3); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msgb_free(l3); } @@ -593,7 +623,8 @@ gsm0808_prepend_dtap_header(in_msg, 0x3); in_msg->l3h = in_msg->data; - VERIFY(in_msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(in_msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(in_msg); } -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181212/159c8a58/attachment.htm>