From cf77b3a2cfde2b7ef4ac2eacd1820f112e35f71c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 26 Dec 2012 12:19:53 +0100 Subject: abis_test: Fix the test case and calculate the right offset We parse the load_config, take the ptrdiff_t from start and load_config and from the previous array as the alignment can differ on different ABIs. This was found by Daniel when executing the tests on a 64 bit userspace. --- openbsc/tests/abis/abis_test.c | 4 ++-- openbsc/tests/abis/abis_test.ok | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'openbsc') diff --git a/openbsc/tests/abis/abis_test.c b/openbsc/tests/abis/abis_test.c index 4942a1e25..e7e78d202 100644 --- a/openbsc/tests/abis/abis_test.c +++ b/openbsc/tests/abis/abis_test.c @@ -129,11 +129,11 @@ static void test_sw_selection(void) abort(); } - printf("Start: %u len: %zu\n", descr[0].start - dual_config, descr[0].len); + printf("Start: %u len: %zu\n", descr[0].start - load_config, descr[0].len); printf("file_id: %s\n", osmo_hexdump(descr[0].file_id, descr[0].file_id_len)); printf("file_ver: %s\n", osmo_hexdump(descr[0].file_ver, descr[0].file_ver_len)); - printf("Start: %u len: %zu\n", descr[1].start - dual_config, descr[1].len); + printf("Start: %u len: %zu\n", descr[1].start - load_config, descr[1].len); printf("file_id: %s\n", osmo_hexdump(descr[1].file_id, descr[1].file_id_len)); printf("file_ver: %s\n", osmo_hexdump(descr[1].file_ver, descr[1].file_ver_len)); diff --git a/openbsc/tests/abis/abis_test.ok b/openbsc/tests/abis/abis_test.ok index ba1da338a..2f99f9d49 100644 --- a/openbsc/tests/abis/abis_test.ok +++ b/openbsc/tests/abis/abis_test.ok @@ -7,10 +7,10 @@ file_ver: 03 04 05 Start: 13 len: 13 file_id: 09 07 05 file_ver: 06 07 08 -Start: 51 len: 26 +Start: 0 len: 26 file_id: 31 36 38 64 34 37 32 00 file_ver: 76 32 30 30 62 31 34 33 64 30 00 -Start: 77 len: 26 +Start: 26 len: 26 file_id: 31 36 38 64 34 37 32 00 file_ver: 76 32 30 30 62 31 34 33 64 31 00 SELECTED: 1 -- cgit v1.2.3