Page MenuHomeFreeBSD
Files F140111545

D23193.id66788.diff
No OneTemporary
Actions

D23193.id66788.diff
View Options

Index: sbin/ping/tests/in_cksum_test.c
===================================================================
--- sbin/ping/tests/in_cksum_test.c
+++ sbin/ping/tests/in_cksum_test.c
@@ -29,6 +29,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: head/sbin/ping/tests/in_cksum_test.c 351318 2019-08-20 21:59:48Z asomers $");
+#include <sys/endian.h>
#include <sys/param.h>
#include <atf-c.h>
@@ -39,88 +40,64 @@
* Test cases.
*/
-ATF_TC_WITHOUT_HEAD(aligned_even_length_big_endian);
-ATF_TC_BODY(aligned_even_length_big_endian, tc)
-{
- u_char data[] __aligned(sizeof(u_short)) =
- {0x12, 0x34, 0x56, 0x78};
- u_short sum;
-
- sum = in_cksum(data, nitems(data));
- ATF_REQUIRE(sum == 0x5397);
-}
-
-ATF_TC_WITHOUT_HEAD(aligned_odd_length_big_endian);
-ATF_TC_BODY(aligned_odd_length_big_endian, tc)
-{
- u_char data[] __aligned(sizeof(u_short)) =
- {0x12, 0x34, 0x56, 0x78, 0x9a};
- u_short sum;
-
- sum = in_cksum(data, nitems(data));
- ATF_REQUIRE(sum == 0x52fd);
-}
-
-ATF_TC_WITHOUT_HEAD(aligned_even_length_little_endian);
-ATF_TC_BODY(aligned_even_length_little_endian, tc)
+ATF_TC_WITHOUT_HEAD(aligned_even_length);
+ATF_TC_BODY(aligned_even_length, tc)
{
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_char data[] __aligned(sizeof(u_short)) =
{0x34, 0x12, 0x78, 0x56};
+#else
+ u_char data[] __aligned(sizeof(u_short)) =
+ {0x12, 0x34, 0x56, 0x78};
+#endif
u_short sum;
sum = in_cksum(data, nitems(data));
- ATF_REQUIRE_MSG(sum == 0x9753, "%d", sum);
+ ATF_REQUIRE(sum == 0x9753);
}
-ATF_TC_WITHOUT_HEAD(aligned_odd_length_little_endian);
-ATF_TC_BODY(aligned_odd_length_little_endian, tc)
+ATF_TC_WITHOUT_HEAD(aligned_odd_length);
+ATF_TC_BODY(aligned_odd_length, tc)
{
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_char data[] __aligned(sizeof(u_short)) =
{0x34, 0x12, 0x78, 0x56, 0x00, 0x9a};
+#else
+ u_char data[] __aligned(sizeof(u_short)) =
+ {0x12, 0x34, 0x56, 0x78, 0x9a};
+#endif
u_short sum;
sum = in_cksum(data, nitems(data));
ATF_REQUIRE(sum == 0xfd52);
}
-ATF_TC_WITHOUT_HEAD(unaligned_even_length_big_endian);
-ATF_TC_BODY(unaligned_even_length_big_endian, tc)
-{
- u_char data[] __aligned(sizeof(u_short)) =
- {0x00, 0x12, 0x34, 0x56, 0x78};
- u_short sum;
-
- sum = in_cksum(data + 1, nitems(data) - 1);
- ATF_REQUIRE(sum == 0x5397);
-}
-
-ATF_TC_WITHOUT_HEAD(unaligned_odd_length_big_endian);
-ATF_TC_BODY(unaligned_odd_length_big_endian, tc)
-{
- u_char data[] __aligned(sizeof(u_short)) =
- {0x00, 0x12, 0x34, 0x56, 0x78, 0x9a};
- u_short sum;
-
- sum = in_cksum(data + 1, nitems(data) - 1);
- ATF_REQUIRE(sum == 0x52fd);
-}
-
-ATF_TC_WITHOUT_HEAD(unaligned_even_length_little_endian);
-ATF_TC_BODY(unaligned_even_length_little_endian, tc)
+ATF_TC_WITHOUT_HEAD(unaligned_even_length);
+ATF_TC_BODY(unaligned_even_length, tc)
{
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_char data[] __aligned(sizeof(u_short)) =
{0x00, 0x34, 0x12, 0x78, 0x56};
+#else
+ u_char data[] __aligned(sizeof(u_short)) =
+ {0x00, 0x12, 0x34, 0x56, 0x78};
+#endif
u_short sum;
sum = in_cksum(data + 1, nitems(data) - 1);
- ATF_REQUIRE_MSG(sum == 0x9753, "%d", sum);
+ ATF_REQUIRE(sum == 0x9753);
}
-ATF_TC_WITHOUT_HEAD(unaligned_odd_length_little_endian);
-ATF_TC_BODY(unaligned_odd_length_little_endian, tc)
+ATF_TC_WITHOUT_HEAD(unaligned_odd_length);
+ATF_TC_BODY(unaligned_odd_length, tc)
{
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_char data[] __aligned(sizeof(u_short)) =
{0x00, 0x34, 0x12, 0x78, 0x56, 0x00, 0x9a};
+#else
+ u_char data[] __aligned(sizeof(u_short)) =
+ {0x00, 0x12, 0x34, 0x56, 0x78, 0x9a};
+#endif
u_short sum;
sum = in_cksum(data + 1, nitems(data) - 1);
@@ -133,14 +110,10 @@
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, aligned_even_length_big_endian);
- ATF_TP_ADD_TC(tp, aligned_odd_length_big_endian);
- ATF_TP_ADD_TC(tp, aligned_even_length_little_endian);
- ATF_TP_ADD_TC(tp, aligned_odd_length_little_endian);
- ATF_TP_ADD_TC(tp, unaligned_even_length_big_endian);
- ATF_TP_ADD_TC(tp, unaligned_odd_length_big_endian);
- ATF_TP_ADD_TC(tp, unaligned_even_length_little_endian);
- ATF_TP_ADD_TC(tp, unaligned_odd_length_little_endian);
+ ATF_TP_ADD_TC(tp, aligned_even_length);
+ ATF_TP_ADD_TC(tp, aligned_odd_length);
+ ATF_TP_ADD_TC(tp, unaligned_even_length);
+ ATF_TP_ADD_TC(tp, unaligned_odd_length);
return (atf_no_error());
}

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 9:33 AM (3 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27110873
Default Alt Text
D23193.id66788.diff (4 KB)

Event Timeline