Skip to content

Commit

Permalink
test: support older libcheck for ubuntu20.04
Browse files Browse the repository at this point in the history
Ubuntu 20.04 ships libcheck 0.9 still, which doesn't have the newer
ck_assert_mem_eq function.

Use the old variant instead: ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used));

Signed-off-by: Robin H. Johnson <[email protected]>
  • Loading branch information
robbat2 committed Dec 30, 2024
1 parent 94a99f5 commit b9f5e80
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions test/send.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ START_TEST(test_add_ra_options_dnssl)
};

ck_assert_int_eq(sizeof(expected), sb.used);
ck_assert_mem_eq(expected, sb.buffer, sb.used);
ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used)); // Newer libcheck supports: ck_assert_mem_eq(expected, sb.buffer, sb.used);
#endif

safe_buffer_free(&sb);
Expand Down Expand Up @@ -404,7 +404,7 @@ START_TEST(test_add_ra_options_dnssl1)
};

ck_assert_int_eq(sizeof(expected), sb.used);
ck_assert_mem_eq(expected, sb.buffer, sb.used);
ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used)); // Newer libcheck supports: ck_assert_mem_eq(expected, sb.buffer, sb.used);
#endif

safe_buffer_free(&sb);
Expand Down Expand Up @@ -450,7 +450,7 @@ START_TEST(test_add_ra_options_dnssl2)
};

ck_assert_int_eq(sizeof(expected), sb.used);
ck_assert_mem_eq(expected, sb.buffer, sb.used);
ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used)); // Newer libcheck supports: ck_assert_mem_eq(expected, sb.buffer, sb.used);
#endif

safe_buffer_free(&sb);
Expand Down Expand Up @@ -498,7 +498,7 @@ START_TEST(test_add_ra_options_dnssl3)


ck_assert_int_eq(sizeof(expected), sb.used);
ck_assert_mem_eq(expected, sb.buffer, sb.used);
ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used)); // Newer libcheck supports: ck_assert_mem_eq(expected, sb.buffer, sb.used);
#endif

safe_buffer_free(&sb);
Expand Down Expand Up @@ -566,7 +566,7 @@ START_TEST(test_add_ra_options_dnssl4)
};

ck_assert_int_eq(sizeof(expected), sb.used);
ck_assert_mem_eq(expected, sb.buffer, sb.used);
ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used)); // Newer libcheck supports: ck_assert_mem_eq(expected, sb.buffer, sb.used);
#endif

safe_buffer_free(&sb);
Expand Down Expand Up @@ -601,7 +601,7 @@ START_TEST(test_add_ra_options_dnssl5)

unsigned char expected[] = {}; // intentional, the DNSSL option in this config should be skipped.
ck_assert_int_eq(sizeof(expected), sb.used);
ck_assert_mem_eq(expected, sb.buffer, sb.used);
ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used)); // Newer libcheck supports: ck_assert_mem_eq(expected, sb.buffer, sb.used);
#endif

safe_buffer_free(&sb);
Expand Down Expand Up @@ -671,7 +671,7 @@ START_TEST(test_add_ra_options_dnssl6)
};

ck_assert_int_eq(sizeof(expected), sb.used);
ck_assert_mem_eq(expected, sb.buffer, sb.used);
ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used)); // Newer libcheck supports: ck_assert_mem_eq(expected, sb.buffer, sb.used);
#endif

safe_buffer_free(&sb);
Expand Down

0 comments on commit b9f5e80

Please sign in to comment.