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/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16988 )
Change subject: tests/rlcmac: Use osmo_hexdump to print buffers
......................................................................
tests/rlcmac: Use osmo_hexdump to print buffers
Old method takes lots of lines of codes and prints inn unconfortable way
because left-trailing zeros are dropped, making it difficult to split in
bytes.
Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67
---
M tests/rlcmac/RLCMACTest.cpp
M tests/rlcmac/RLCMACTest.ok
2 files changed, 52 insertions(+), 88 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp
index 4af450b..e48a27c 100644
--- a/tests/rlcmac/RLCMACTest.cpp
+++ b/tests/rlcmac/RLCMACTest.cpp
@@ -111,14 +111,10 @@
cout << " DOWNLINK " << endl;
for (int i = 0; i < testDataSize; i++)
{
+ cout << "vector1 = " << testData[i] << endl;
bitvec *vector = bitvec_alloc(23, test_ctx);
bitvec_unhex(vector, testData[i].c_str());
- cout << "vector1 = ";
- for (int i = 0; i < 23; i++)
- {
- cout << hex << (unsigned)*(vector->data + i);
- }
- cout << endl;
+
RlcMacDownlink_t data;
memset(&data, 0, sizeof(data));
cout << "=========Start DECODE===========" << endl;
@@ -127,26 +123,12 @@
cout << "=========Start ENCODE=============" << endl;
encode_gsm_rlcmac_downlink(resultVector, &data);
cout << "+++++++++Finish ENCODE+++++++++++" << endl;
- cout << "vector1 = ";
- for (int i = 0; i < 23; i++)
- {
- cout << (unsigned)*(vector->data + i);
- }
- cout << endl;
- cout << "vector2 = ";
- for (int i = 0; i < 23; i++)
- {
- cout << (unsigned)*(resultVector->data + i);
- }
- cout << endl;
+ cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl;
+ cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl;
if (memcmp(vector->data, resultVector->data, 23) == 0)
- {
cout << "vector1 == vector2 : TRUE" << endl;
- }
else
- {
cout << "vector1 == vector2 : FALSE" << endl;
- }
bitvec_unhex(resultVector, DUMMY_VEC);
bitvec_free(vector);
}
@@ -175,14 +157,10 @@
cout << " UPLINK " << endl;
for (int i = 0; i < testDataSize; i++)
{
+ cout << "vector1 = " << testData[i] << endl;
bitvec *vector = bitvec_alloc(23, test_ctx);
bitvec_unhex(vector, testData[i].c_str());
- cout << "vector1 = ";
- for (int i = 0; i < 23; i++)
- {
- cout << hex << (unsigned)*(vector->data + i);
- }
- cout << endl;
+
RlcMacUplink_t data;
memset(&data, 0, sizeof(data));
cout << "=========Start DECODE===========" << endl;
@@ -191,26 +169,12 @@
cout << "=========Start ENCODE=============" << endl;
encode_gsm_rlcmac_uplink(resultVector, &data);
cout << "+++++++++Finish ENCODE+++++++++++" << endl;
- cout << "vector1 = ";
- for (int i = 0; i < 23; i++)
- {
- cout << (unsigned)*(vector->data + i);
- }
- cout << endl;
- cout << "vector2 = ";
- for (int i = 0; i < 23; i++)
- {
- cout << (unsigned)*(resultVector->data + i);
- }
- cout << endl;
+ cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl;
+ cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl;
if (memcmp(vector->data, resultVector->data, 23) == 0)
- {
cout << "vector1 == vector2 : TRUE" << endl;
- }
else
- {
cout << "vector1 == vector2 : FALSE" << endl;
- }
bitvec_unhex(resultVector, DUMMY_VEC);
bitvec_free(vector);
}
diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok
index 05bfc2e..2af4d90 100644
--- a/tests/rlcmac/RLCMACTest.ok
+++ b/tests/rlcmac/RLCMACTest.ok
@@ -1,125 +1,125 @@
*** testRlcMacDownlink ***
DOWNLINK
-vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b
+vector1 = 4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b
-vector2 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b
+vector1 = 4e 08 25 00 e3 f1 a8 1d 08 08 20 80 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 4e 08 25 00 e3 f1 a8 1d 08 08 20 80 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b
+vector1 = 48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b
-vector2 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b
+vector1 = 48 28 24 07 a6 a0 74 22 72 01 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 48 28 24 07 a6 a0 74 22 72 01 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b
+vector1 = 47240c00400000000000000079eb2ac9402b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b
-vector2 = 4724c040000000079eb2ac9402b2b2b2b2b2b
+vector1 = 47 24 0c 00 40 00 00 00 00 00 00 00 79 eb 2a c9 40 2b 2b 2b 2b 2b 2b
+vector2 = 47 24 0c 00 40 00 00 00 00 00 00 00 79 eb 2a c9 40 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b
-vector2 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 47 28 3c 36 75 13 ba 33 30 04 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 47 28 3c 36 75 13 ba 33 30 04 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b
+vector1 = 400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b
-vector2 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b
+vector1 = 40 08 20 00 1a 39 04 df 06 80 ef b3 30 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 40 08 20 00 1a 39 04 df 06 80 ef b3 30 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 40284f00010981c826f446809dcecb2b2b2b2b2b
+vector1 = 40284f0000001009810c826f4406809dcecb2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 40284f00010981c826f446809dcecb2b2b2b2b2b
-vector2 = 40284f00010981c826f446809dcecb2b2b2b2b2b
+vector1 = 40 28 4f 00 00 00 10 09 81 0c 82 6f 44 06 80 9d ce cb 2b 2b 2b 2b 2b
+vector2 = 40 28 4f 00 00 00 10 09 81 0c 82 6f 44 06 80 9d ce cb 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b
+vector1 = 4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b
-vector2 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b
+vector1 = 40 24 03 0f 2f 00 00 00 00 87 b0 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 40 24 03 0f 2f 00 00 00 00 87 b0 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b
-vector2 = 491312b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 49 13 e0 08 50 88 40 13 a8 04 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 49 13 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : FALSE
-vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b
+vector1 = 412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b
-vector2 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b
+vector1 = 41 24 30 00 7f ff ff ff ff ff ff ff ef d1 9c 7b a1 2b 2b 2b 2b 2b 2b
+vector2 = 41 24 30 00 7f ff ff ff ff ff ff ff ef d1 9c 7b a1 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
-vector2 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 41 94 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 41 94 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
*** testRlcMacUplink ***
UPLINK
-vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
-vector2 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 40 0e 1e 61 d1 1d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 40 0e 1e 61 d1 1d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b
+vector1 = 400b8020000000000000002480e0032b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b
-vector2 = 40b802000000002480e032b2b2b2b2b2b2b2b
+vector1 = 40 0b 80 20 00 00 00 00 00 00 00 24 80 e0 03 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 40 0b 80 20 00 00 00 00 00 00 00 24 80 e0 03 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b
+vector1 = 4016713dc094270ca2ae57ef909006aa0fc0001f80222b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b
-vector2 = 4016713dc09427ca2ae57ef90906aafc001f80222b
+vector1 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b
+vector2 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b
vector1 == vector2 : TRUE
-vector1 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
-vector2 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+vector1 = 40 20 0f fc 00 21 ec 01 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+vector2 = 40 20 0f fc 00 21 ec 01 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
-vector1 = 40a90200000000301012a80132b2b2b2b2b
+vector1 = 400a9020000000000000003010012a0800132b2b2b2b2b
=========Start DECODE===========
+++++++++Finish DECODE++++++++++
=========Start ENCODE=============
+++++++++Finish ENCODE+++++++++++
-vector1 = 40a90200000000301012a80132b2b2b2b2b
-vector2 = 40a90200000000301012a80132b2b2b2b2b
+vector1 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b
+vector2 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
*** testCsnLeftAlignedVarBmpBounds ***
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67
Gerrit-Change-Number: 16988
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200125/74fd1c81/attachment.htm>