denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit-tests: Fix filtered enumerator tests on 64-bit big-endian platforms

Browse Source 
In case of sizeof(void*) == 8 and sizeof(int) == 4 on big-endian hosts
the tests failed as the actual integer value got cut off.
This commit is contained in:
Tobias Brunner
2014-03-27 15:35:32 +01:00
parent 29b7377530
commit 0462304dbb
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/tests/suites/test_enumerator.c
+12 -12
View File
@@ -104,10 +104,10 @@ static void destroy_data(void *data)
* filtered test * filtered test
*/ */
static bool filter(void *data, int *v, int *vo, int *w, int *wo, static bool filter(int *data, int **v, int *vo, int **w, int *wo,
int *x, int *xo, int *y, int *yo, int *z, int *zo) int **x, int *xo, int **y, int *yo, int **z, int *zo)
{ {
int val = *v; int val = **v;
*vo = val++; *vo = val++;
*wo = val++; *wo = val++;
@@ -118,21 +118,21 @@ static bool filter(void *data, int *v, int *vo, int *w, int *wo,
return TRUE; return TRUE;
} }
static bool filter_odd(void *data, int *item, int *out) static bool filter_odd(void *data, int **item, int *out)
{ {
fail_if(data != (void*)101, "data does not match '101' in filter function"); fail_if(data != (void*)101, "data does not match '101' in filter function");
*out = *item; *out = **item;
return *item % 2 == 0; return **item % 2 == 0;
} }
START_TEST(test_filtered) START_TEST(test_filtered)
{ {
int round, v, w, x, y, z; int data[5] = {1,2,3,4,5}, round, v, w, x, y, z;
linked_list_t *list; linked_list_t *list;
enumerator_t *enumerator; enumerator_t *enumerator;
list = linked_list_create_with_items((void*)1, (void*)2, (void*)3, (void*)4, list = linked_list_create_with_items(&data[0], &data[1], &data[2], &data[3],
(void*)5, NULL); &data[4], NULL);
round = 1; round = 1;
enumerator = enumerator_create_filter(list->create_enumerator(list), enumerator = enumerator_create_filter(list->create_enumerator(list),
@@ -155,12 +155,12 @@ END_TEST
START_TEST(test_filtered_filter) START_TEST(test_filtered_filter)
{ {
int count, x; int data[5] = {1,2,3,4,5}, count, x;
linked_list_t *list; linked_list_t *list;
enumerator_t *enumerator; enumerator_t *enumerator;
list = linked_list_create_with_items((void*)1, (void*)2, (void*)3, (void*)4, list = linked_list_create_with_items(&data[0], &data[1], &data[2], &data[3],
(void*)5, NULL); &data[4], NULL);
count = 0; count = 0;
/* should also work without destructor, so set this manually */ /* should also work without destructor, so set this manually */