From 28da1fa3ef65b558412df6d903e1053ab105d27f Mon Sep 17 00:00:00 2001 From: rolandreichweinmusic Date: Mon, 7 Jul 2025 09:55:59 +0200 Subject: [PATCH] Fix tests on big endian (#1142) * Fix bitset_new test: bitset is implemented as little endian container * Fix test_bsd_checksum.cpp: endian test was only implemented for little endian * Fix endianness test * Fix endian in crc tests * Fix test_fnv_1 * Fix test_hash * Fix test_jenkins * Fix test_memory * Fix pearson test * Fix test_xor_rotate_checksum * Fix murmur test --- test/murmurhash3.cpp | 20 ++++++++- test/test_bitset_new_default_element_type.cpp | 37 ++++------------- ...st_bitset_new_ext_default_element_type.cpp | 36 ++++------------ test/test_bsd_checksum.cpp | 11 ++++- test/test_crc16.cpp | 31 ++++++++++++-- test/test_crc16_a.cpp | 31 ++++++++++++-- test/test_crc16_arc.cpp | 31 ++++++++++++-- test/test_crc16_aug_ccitt.cpp | 31 ++++++++++++-- test/test_crc16_buypass.cpp | 31 ++++++++++++-- test/test_crc16_ccitt.cpp | 31 ++++++++++++-- test/test_crc16_cdma2000.cpp | 31 ++++++++++++-- test/test_crc16_dds110.cpp | 31 ++++++++++++-- test/test_crc16_dectr.cpp | 31 ++++++++++++-- test/test_crc16_dectx.cpp | 31 ++++++++++++-- test/test_crc16_dnp.cpp | 31 ++++++++++++-- test/test_crc16_en13757.cpp | 31 ++++++++++++-- test/test_crc16_genibus.cpp | 31 ++++++++++++-- test/test_crc16_kermit.cpp | 31 ++++++++++++-- test/test_crc16_m17.cpp | 31 ++++++++++++-- test/test_crc16_maxim.cpp | 31 ++++++++++++-- test/test_crc16_mcrf4xx.cpp | 31 ++++++++++++-- test/test_crc16_modbus.cpp | 31 ++++++++++++-- test/test_crc16_profibus.cpp | 31 ++++++++++++-- test/test_crc16_riello.cpp | 31 ++++++++++++-- test/test_crc16_t10dif.cpp | 31 ++++++++++++-- test/test_crc16_teledisk.cpp | 31 ++++++++++++-- test/test_crc16_tms37157.cpp | 31 ++++++++++++-- test/test_crc16_usb.cpp | 31 ++++++++++++-- test/test_crc16_x25.cpp | 31 ++++++++++++-- test/test_crc16_xmodem.cpp | 31 ++++++++++++-- test/test_crc32.cpp | 31 ++++++++++++-- test/test_crc32_bzip2.cpp | 31 ++++++++++++-- test/test_crc32_c.cpp | 31 ++++++++++++-- test/test_crc32_d.cpp | 31 ++++++++++++-- test/test_crc32_jamcrc.cpp | 31 ++++++++++++-- test/test_crc32_mpeg2.cpp | 31 ++++++++++++-- test/test_crc32_posix.cpp | 31 ++++++++++++-- test/test_crc32_q.cpp | 31 ++++++++++++-- test/test_crc32_xfer.cpp | 31 ++++++++++++-- test/test_crc64_ecma.cpp | 31 ++++++++++++-- test/test_crc8_ccitt.cpp | 31 ++++++++++++-- test/test_crc8_cdma2000.cpp | 31 ++++++++++++-- test/test_crc8_darc.cpp | 31 ++++++++++++-- test/test_crc8_dvbs2.cpp | 31 ++++++++++++-- test/test_crc8_ebu.cpp | 31 ++++++++++++-- test/test_crc8_icode.cpp | 31 ++++++++++++-- test/test_crc8_itu.cpp | 31 ++++++++++++-- test/test_crc8_j1850.cpp | 31 ++++++++++++-- test/test_crc8_j1850_zero.cpp | 31 ++++++++++++-- test/test_crc8_maxim.cpp | 31 ++++++++++++-- test/test_crc8_rohc.cpp | 31 ++++++++++++-- test/test_crc8_wcdma.cpp | 31 ++++++++++++-- test/test_endian.cpp | 26 +++++++++--- test/test_fnv_1.cpp | 41 +++++++++++++++++-- test/test_hash.cpp | 10 ++++- test/test_jenkins.cpp | 11 ++++- test/test_memory.cpp | 37 +++++++++++++++-- test/test_murmur3.cpp | 11 ++++- test/test_pearson.cpp | 11 ++++- test/test_xor_rotate_checksum.cpp | 11 ++++- 60 files changed, 1528 insertions(+), 222 deletions(-) diff --git a/test/murmurhash3.cpp b/test/murmurhash3.cpp index c50769af..dc1f0c13 100644 --- a/test/murmurhash3.cpp +++ b/test/murmurhash3.cpp @@ -14,6 +14,8 @@ #endif #include "murmurhash3.h" +#include "etl/bit.h" +#include "etl/endianness.h" //----------------------------------------------------------------------------- // Platform-specific functions and macros @@ -60,13 +62,27 @@ inline uint64_t rotl64(uint64_t x, int8_t r) FORCE_INLINE uint32_t getblock32(const uint32_t * p, int i) { - return p[i]; + if (etl::endianness::value() == etl::endian::little) + { + return p[i]; + } + else + { + return etl::byteswap(p[i]); + } } #if ETL_USING_64BIT_TYPES FORCE_INLINE uint64_t getblock64(const uint64_t * p, int i) { - return p[i]; + if (etl::endianness::value() == etl::endian::little) + { + return p[i]; + } + else + { + return etl::byteswap(p[i]); + } } #endif diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp index 0722524e..30619fcf 100644 --- a/test/test_bitset_new_default_element_type.cpp +++ b/test/test_bitset_new_default_element_type.cpp @@ -37,7 +37,6 @@ SOFTWARE. #include "etl/wstring.h" #include "etl/u16string.h" #include "etl/u32string.h" -#include "etl/endianness.h" namespace { @@ -2105,20 +2104,10 @@ namespace span_t s = b.span(); - if (etl::endianness::value() == etl::endian::little) - { - CHECK_EQUAL(0x78UL, s[0]); - CHECK_EQUAL(0x56UL, s[1]); - CHECK_EQUAL(0x34UL, s[2]); - CHECK_EQUAL(0x12UL, s[3]); - } - else - { - CHECK_EQUAL(0x78UL, s[3]); - CHECK_EQUAL(0x56UL, s[2]); - CHECK_EQUAL(0x34UL, s[1]); - CHECK_EQUAL(0x12UL, s[0]); - } + CHECK_EQUAL(0x78UL, s[0]); + CHECK_EQUAL(0x56UL, s[1]); + CHECK_EQUAL(0x34UL, s[2]); + CHECK_EQUAL(0x12UL, s[3]); s[2] = 0x9AU; uint32_t value = b.value(); @@ -2134,20 +2123,10 @@ namespace span_t s = b.span(); - if (etl::endianness::value() == etl::endian::little) - { - CHECK_EQUAL(0x78UL, s[0]); - CHECK_EQUAL(0x56UL, s[1]); - CHECK_EQUAL(0x34UL, s[2]); - CHECK_EQUAL(0x12UL, s[3]); - } - else - { - CHECK_EQUAL(0x78UL, s[3]); - CHECK_EQUAL(0x56UL, s[2]); - CHECK_EQUAL(0x34UL, s[1]); - CHECK_EQUAL(0x12UL, s[0]); - } + CHECK_EQUAL(0x78UL, s[0]); + CHECK_EQUAL(0x56UL, s[1]); + CHECK_EQUAL(0x34UL, s[2]); + CHECK_EQUAL(0x12UL, s[3]); } //************************************************************************* diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp index 6e606c0f..3cc9fc25 100644 --- a/test/test_bitset_new_ext_default_element_type.cpp +++ b/test/test_bitset_new_ext_default_element_type.cpp @@ -1803,20 +1803,10 @@ namespace span_t s = b.span(); - if (etl::endianness::value() == etl::endian::little) - { - CHECK_EQUAL(0x78UL, s[0]); - CHECK_EQUAL(0x56UL, s[1]); - CHECK_EQUAL(0x34UL, s[2]); - CHECK_EQUAL(0x12UL, s[3]); - } - else - { - CHECK_EQUAL(0x78UL, s[3]); - CHECK_EQUAL(0x56UL, s[2]); - CHECK_EQUAL(0x34UL, s[1]); - CHECK_EQUAL(0x12UL, s[0]); - } + CHECK_EQUAL(0x78UL, s[0]); + CHECK_EQUAL(0x56UL, s[1]); + CHECK_EQUAL(0x34UL, s[2]); + CHECK_EQUAL(0x12UL, s[3]); s[2] = 0x9AU; uint32_t value = b.value(); @@ -1833,20 +1823,10 @@ namespace bs32 b(0x12345678UL, buffer); span_t s = b.span(); - if (etl::endianness::value() == etl::endian::little) - { - CHECK_EQUAL(0x78UL, s[0]); - CHECK_EQUAL(0x56UL, s[1]); - CHECK_EQUAL(0x34UL, s[2]); - CHECK_EQUAL(0x12UL, s[3]); - } - else - { - CHECK_EQUAL(0x78UL, s[3]); - CHECK_EQUAL(0x56UL, s[2]); - CHECK_EQUAL(0x34UL, s[1]); - CHECK_EQUAL(0x12UL, s[0]); - } + CHECK_EQUAL(0x78UL, s[0]); + CHECK_EQUAL(0x56UL, s[1]); + CHECK_EQUAL(0x34UL, s[2]); + CHECK_EQUAL(0x12UL, s[3]); } //************************************************************************* diff --git a/test/test_bsd_checksum.cpp b/test/test_bsd_checksum.cpp index a091c8a8..2dff6c74 100644 --- a/test/test_bsd_checksum.cpp +++ b/test/test_bsd_checksum.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/checksum.h" +#include "etl/endianness.h" namespace { @@ -155,7 +156,15 @@ namespace TEST(test_checksum_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint64_t hash1 = etl::bsd_checksum(data1.begin(), data1.end()); diff --git a/test/test_crc16.cpp b/test/test_crc16.cpp index 33057dae..de947c94 100644 --- a/test/test_crc16.cpp +++ b/test/test_crc16.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -104,7 +105,15 @@ namespace TEST(test_crc16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16(data1.begin(), data1.end()); @@ -187,7 +196,15 @@ namespace TEST(test_crc16_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_t16(data1.begin(), data1.end()); @@ -270,7 +287,15 @@ namespace TEST(test_crc16_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_a.cpp b/test/test_crc16_a.cpp index 778c2f9f..2dd49ee5 100644 --- a/test/test_crc16_a.cpp +++ b/test/test_crc16_a.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_a.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_a_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_a(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_a_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_a_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_a_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_a_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_arc.cpp b/test/test_crc16_arc.cpp index 73195d74..8e7376bf 100644 --- a/test/test_crc16_arc.cpp +++ b/test/test_crc16_arc.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_arc.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_arc_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_arc(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_arc_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_arc_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_arc_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_arc_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_aug_ccitt.cpp b/test/test_crc16_aug_ccitt.cpp index 1e16bfff..54ce1d2b 100644 --- a/test/test_crc16_aug_ccitt.cpp +++ b/test/test_crc16_aug_ccitt.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_aug_ccitt.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_aug_ccitt_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_aug_ccitt(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_aug_ccitt_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_aug_ccitt_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_aug_ccitt_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_aug_ccitt_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_buypass.cpp b/test/test_crc16_buypass.cpp index acd2f76a..14b2b45d 100644 --- a/test/test_crc16_buypass.cpp +++ b/test/test_crc16_buypass.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_buypass.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_buypass_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_buypass(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_buypass_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_buypass_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_buypass_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_buypass_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_ccitt.cpp b/test/test_crc16_ccitt.cpp index 90202fa2..3492252e 100644 --- a/test/test_crc16_ccitt.cpp +++ b/test/test_crc16_ccitt.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_ccitt.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_ccitt_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_ccitt(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_ccitt_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_ccitt_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_ccitt_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_ccitt_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_cdma2000.cpp b/test/test_crc16_cdma2000.cpp index 60166f9f..b80b1891 100644 --- a/test/test_crc16_cdma2000.cpp +++ b/test/test_crc16_cdma2000.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_cdma2000.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_cdma2000_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_cdma2000(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_cdma2000_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_cdma2000_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_cdma2000_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_cdma2000_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_dds110.cpp b/test/test_crc16_dds110.cpp index 7c7145c4..20e1869f 100644 --- a/test/test_crc16_dds110.cpp +++ b/test/test_crc16_dds110.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_dds110.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_dds110_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dds110(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_dds110_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dds110_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_dds110_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dds110_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_dectr.cpp b/test/test_crc16_dectr.cpp index 0374c3bc..e713b725 100644 --- a/test/test_crc16_dectr.cpp +++ b/test/test_crc16_dectr.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_dectr.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_dect_r_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dectr(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_dect_r_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dect_r_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_dect_r_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dect_r_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_dectx.cpp b/test/test_crc16_dectx.cpp index 7dadc3a5..f3e77a15 100644 --- a/test/test_crc16_dectx.cpp +++ b/test/test_crc16_dectx.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_dectx.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_dect_x_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dectx(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_dect_x_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dect_x_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_dect_x_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dect_x_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_dnp.cpp b/test/test_crc16_dnp.cpp index 1de99a59..5402dd9d 100644 --- a/test/test_crc16_dnp.cpp +++ b/test/test_crc16_dnp.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_dnp.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_dnp_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dnp(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_dnp_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dnp_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_dnp_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_dnp_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_en13757.cpp b/test/test_crc16_en13757.cpp index b05de99c..a70b3425 100644 --- a/test/test_crc16_en13757.cpp +++ b/test/test_crc16_en13757.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_en13757.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_en13757_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_en13757(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_en13757_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_en13757_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_en13757_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_en13757_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_genibus.cpp b/test/test_crc16_genibus.cpp index 9e7e15f4..1ab9bbf1 100644 --- a/test/test_crc16_genibus.cpp +++ b/test/test_crc16_genibus.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_genibus.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_genibus_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_genibus(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_genibus_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_genibus_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_genibus_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_genibus_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_kermit.cpp b/test/test_crc16_kermit.cpp index 93b044d0..32fc673e 100644 --- a/test/test_crc16_kermit.cpp +++ b/test/test_crc16_kermit.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_kermit.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_kermit_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_kermit(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_kermit_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_kermit_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_kermit_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_kermit_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_m17.cpp b/test/test_crc16_m17.cpp index 9f25eae3..5a6fda2d 100644 --- a/test/test_crc16_m17.cpp +++ b/test/test_crc16_m17.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_m17.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_m17_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_m17(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_m17_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_m17_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_m17_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_m17_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_maxim.cpp b/test/test_crc16_maxim.cpp index e238dee7..38b3058b 100644 --- a/test/test_crc16_maxim.cpp +++ b/test/test_crc16_maxim.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_maxim.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_maxim_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_maxim(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_maxim_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_maxim_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_maxim_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_maxim_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_mcrf4xx.cpp b/test/test_crc16_mcrf4xx.cpp index 1ea47d4e..b7509aae 100644 --- a/test/test_crc16_mcrf4xx.cpp +++ b/test/test_crc16_mcrf4xx.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_mcrf4xx.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_mcrf4xx_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_mcrf4xx(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_mcrf4xx_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_mcrf4xx_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_mcrf4xx_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_mcrf4xx_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_modbus.cpp b/test/test_crc16_modbus.cpp index 99fbde1b..e747a9ea 100644 --- a/test/test_crc16_modbus.cpp +++ b/test/test_crc16_modbus.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_modbus.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_modbus_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_modbus(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_modbus_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_modbus_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_modbus_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_modbus_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_profibus.cpp b/test/test_crc16_profibus.cpp index f6db3473..a7e3f301 100644 --- a/test/test_crc16_profibus.cpp +++ b/test/test_crc16_profibus.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_profibus.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_profibus_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_profibus(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_profibus_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_profibus_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_profibus_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_profibus_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_riello.cpp b/test/test_crc16_riello.cpp index 60af15ac..319b0a84 100644 --- a/test/test_crc16_riello.cpp +++ b/test/test_crc16_riello.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_riello.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_riello_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_riello(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_riello_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_riello_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_riello_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_riello_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_t10dif.cpp b/test/test_crc16_t10dif.cpp index 83c2d973..570b9935 100644 --- a/test/test_crc16_t10dif.cpp +++ b/test/test_crc16_t10dif.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_t10dif.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_t10dif_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_t10dif(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_t10dif_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_t10dif_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_t10dif_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_t10dif_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_teledisk.cpp b/test/test_crc16_teledisk.cpp index fc3bb741..69135f08 100644 --- a/test/test_crc16_teledisk.cpp +++ b/test/test_crc16_teledisk.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_teledisk.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_teledisk_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_teledisk(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_teledisk_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_teledisk_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_teledisk_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_teledisk_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_tms37157.cpp b/test/test_crc16_tms37157.cpp index 893e2b4d..12733b0f 100644 --- a/test/test_crc16_tms37157.cpp +++ b/test/test_crc16_tms37157.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_tms37157.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_tms37157_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_tms37157(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_tms37157_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_tms37157_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_tms37157_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_tms37157_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_usb.cpp b/test/test_crc16_usb.cpp index b0203da9..e3249443 100644 --- a/test/test_crc16_usb.cpp +++ b/test/test_crc16_usb.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_usb.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_usb_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_usb(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_usb_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_usb_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_usb_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_usb_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_x25.cpp b/test/test_crc16_x25.cpp index edea98e7..42799814 100644 --- a/test/test_crc16_x25.cpp +++ b/test/test_crc16_x25.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_x25.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_x25_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_x25(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_x25_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_x25_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_x25_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_x25_t4(data1.begin(), data1.end()); diff --git a/test/test_crc16_xmodem.cpp b/test/test_crc16_xmodem.cpp index a18b072b..4630f438 100644 --- a/test/test_crc16_xmodem.cpp +++ b/test/test_crc16_xmodem.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc16_xmodem.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc16_xmodem_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_xmodem(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc16_xmodem_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_xmodem_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc16_xmodem_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint16_t crc1 = etl::crc16_xmodem_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32.cpp b/test/test_crc32.cpp index 4ff6c7dd..e8ce34e0 100644 --- a/test/test_crc32.cpp +++ b/test/test_crc32.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -104,7 +105,15 @@ namespace TEST(test_crc32_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32(data1.begin(), data1.end()); @@ -187,7 +196,15 @@ namespace TEST(test_crc32_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_t16(data1.begin(), data1.end()); @@ -270,7 +287,15 @@ namespace TEST(test_crc32_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32_bzip2.cpp b/test/test_crc32_bzip2.cpp index 10367e08..262f471e 100644 --- a/test/test_crc32_bzip2.cpp +++ b/test/test_crc32_bzip2.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32_bzip2.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc32_bzip2_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_bzip2(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc32_bzip2_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_bzip2_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc32_bzip2_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_bzip2_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32_c.cpp b/test/test_crc32_c.cpp index feb44482..65e4de2d 100644 --- a/test/test_crc32_c.cpp +++ b/test/test_crc32_c.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32_c.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc32_c_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_c(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc32_c_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_c_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc32_c_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_c_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32_d.cpp b/test/test_crc32_d.cpp index 1ccf3124..8b68d0c6 100644 --- a/test/test_crc32_d.cpp +++ b/test/test_crc32_d.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32_d.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc32_d_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_d(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc32_d_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_d_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc32_d_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_d_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32_jamcrc.cpp b/test/test_crc32_jamcrc.cpp index ad170b44..29f2285f 100644 --- a/test/test_crc32_jamcrc.cpp +++ b/test/test_crc32_jamcrc.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32_jamcrc.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc32_jamcrc_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_jamcrc(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc32_jamcrc_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_jamcrc_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc32_jamcrc_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_jamcrc_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32_mpeg2.cpp b/test/test_crc32_mpeg2.cpp index 5c3533a0..3826e065 100644 --- a/test/test_crc32_mpeg2.cpp +++ b/test/test_crc32_mpeg2.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32_mpeg2.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc32_mpeg2_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_mpeg2(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc32_mpeg2_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_mpeg2_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc32_mpeg2_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_mpeg2_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32_posix.cpp b/test/test_crc32_posix.cpp index 3cfb60cd..fd3101e0 100644 --- a/test/test_crc32_posix.cpp +++ b/test/test_crc32_posix.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32_posix.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc32_posix_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_posix(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc32_posix_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_posix_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc32_posix_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_posix_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32_q.cpp b/test/test_crc32_q.cpp index 3c0f8cdd..92e20e07 100644 --- a/test/test_crc32_q.cpp +++ b/test/test_crc32_q.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32_q.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc32_q_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_q(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc32_q_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_q_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc32_q_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_q_t4(data1.begin(), data1.end()); diff --git a/test/test_crc32_xfer.cpp b/test/test_crc32_xfer.cpp index 75ff0e43..95510fb0 100644 --- a/test/test_crc32_xfer.cpp +++ b/test/test_crc32_xfer.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc32_xfer.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc32_xfer_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_xfer(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc32_xfer_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_xfer_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc32_xfer_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t crc1 = etl::crc32_xfer_t4(data1.begin(), data1.end()); diff --git a/test/test_crc64_ecma.cpp b/test/test_crc64_ecma.cpp index f5d0ebd1..dea9430b 100644 --- a/test/test_crc64_ecma.cpp +++ b/test/test_crc64_ecma.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc64_ecma.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc64_ecma_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint64_t crc1 = etl::crc64_ecma(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc64_ecma_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint64_t crc1 = etl::crc64_ecma_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc64_ecma_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint64_t crc1 = etl::crc64_ecma_t4(data1.begin(), data1.end()); diff --git a/test/test_crc8_ccitt.cpp b/test/test_crc8_ccitt.cpp index a313c5ad..d71ee2ff 100644 --- a/test/test_crc8_ccitt.cpp +++ b/test/test_crc8_ccitt.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_ccitt.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_ccitt_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_ccitt_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_ccitt_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_ccitt_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_ccitt_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_ccitt(data1.begin(), data1.end()); diff --git a/test/test_crc8_cdma2000.cpp b/test/test_crc8_cdma2000.cpp index e5bda16f..71a5b24d 100644 --- a/test/test_crc8_cdma2000.cpp +++ b/test/test_crc8_cdma2000.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_cdma2000.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_cdma2000_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_cdma2000_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_cdma2000_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_cdma2000_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_cdma2000_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_cdma2000(data1.begin(), data1.end()); diff --git a/test/test_crc8_darc.cpp b/test/test_crc8_darc.cpp index a1898d6b..adfef170 100644 --- a/test/test_crc8_darc.cpp +++ b/test/test_crc8_darc.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_darc.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_darc_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_darc_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_darc_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_darc_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_darc_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_darc(data1.begin(), data1.end()); diff --git a/test/test_crc8_dvbs2.cpp b/test/test_crc8_dvbs2.cpp index 086f4069..ea13c3e9 100644 --- a/test/test_crc8_dvbs2.cpp +++ b/test/test_crc8_dvbs2.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_dvbs2.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_dvbs2_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_dvbs2_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_dvbs2_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_dvbs2_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_dvbs2_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_dvbs2(data1.begin(), data1.end()); diff --git a/test/test_crc8_ebu.cpp b/test/test_crc8_ebu.cpp index 662791f9..065498dd 100644 --- a/test/test_crc8_ebu.cpp +++ b/test/test_crc8_ebu.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_ebu.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_ebu_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_ebu_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_ebu_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_ebu_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_ebu_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_ebu(data1.begin(), data1.end()); diff --git a/test/test_crc8_icode.cpp b/test/test_crc8_icode.cpp index 21639eea..33403afd 100644 --- a/test/test_crc8_icode.cpp +++ b/test/test_crc8_icode.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_icode.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_icode_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_icode_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_icode_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_icode_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_icode_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_icode(data1.begin(), data1.end()); diff --git a/test/test_crc8_itu.cpp b/test/test_crc8_itu.cpp index 7156db5a..02924153 100644 --- a/test/test_crc8_itu.cpp +++ b/test/test_crc8_itu.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_itu.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_itu_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_itu_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_itu_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_itu_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_itu_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_itu(data1.begin(), data1.end()); diff --git a/test/test_crc8_j1850.cpp b/test/test_crc8_j1850.cpp index cbea4c08..e0a6b325 100644 --- a/test/test_crc8_j1850.cpp +++ b/test/test_crc8_j1850.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_j1850.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from http://www.sunshine2k.de/coding/javascript/crc/crc_js.html @@ -115,7 +116,15 @@ namespace TEST(test_crc8_j1850_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_j1850_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_j1850_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_j1850_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_j1850_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_j1850(data1.begin(), data1.end()); diff --git a/test/test_crc8_j1850_zero.cpp b/test/test_crc8_j1850_zero.cpp index caa1ed70..0e37afbb 100644 --- a/test/test_crc8_j1850_zero.cpp +++ b/test/test_crc8_j1850_zero.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_j1850_zero.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from http://www.sunshine2k.de/coding/javascript/crc/crc_js.html @@ -115,7 +116,15 @@ namespace TEST(test_crc8_j1850_zero_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_j1850_zero_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_j1850_zero_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_j1850_zero_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_j1850_zero_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_j1850_zero(data1.begin(), data1.end()); diff --git a/test/test_crc8_maxim.cpp b/test/test_crc8_maxim.cpp index 4e1b9d11..e06f5497 100644 --- a/test/test_crc8_maxim.cpp +++ b/test/test_crc8_maxim.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_maxim.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_maxim_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_maxim_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_maxim_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_maxim_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_maxim_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_maxim(data1.begin(), data1.end()); diff --git a/test/test_crc8_rohc.cpp b/test/test_crc8_rohc.cpp index d9f3ac22..84f49726 100644 --- a/test/test_crc8_rohc.cpp +++ b/test/test_crc8_rohc.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_rohc.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_rohc_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_rohc_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_rohc_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_rohc_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_rohc_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_rohc(data1.begin(), data1.end()); diff --git a/test/test_crc8_wcdma.cpp b/test/test_crc8_wcdma.cpp index f5bd9156..2c591e3c 100644 --- a/test/test_crc8_wcdma.cpp +++ b/test/test_crc8_wcdma.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_wcdma.h" +#include "etl/endianness.h" //***************************************************************************** // The results for these tests were created from https://crccalc.com/ @@ -115,7 +116,15 @@ namespace TEST(test_crc8_wcdma_4_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_wcdma_t4(data1.begin(), data1.end()); @@ -198,7 +207,15 @@ namespace TEST(test_crc8_wcdma_16_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_wcdma_t16(data1.begin(), data1.end()); @@ -281,7 +298,15 @@ namespace TEST(test_crc8_wcdma_256_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint8_t crc1 = etl::crc8_wcdma(data1.begin(), data1.end()); diff --git a/test/test_endian.cpp b/test/test_endian.cpp index 3d9fab6d..a0c7720f 100644 --- a/test/test_endian.cpp +++ b/test/test_endian.cpp @@ -38,12 +38,28 @@ namespace //************************************************************************* TEST(test_endianness) { - // Intel platform is little endian. - CHECK(etl::endianness()() == etl::endian::little); - CHECK(etl::endianness()() != etl::endian::big); +#if defined(ETL_ENDIAN_NATIVE) && defined(ETL_ENDIAN_BIG) + if (ETL_ENDIAN_NATIVE == ETL_ENDIAN_BIG) + { + // Big endian platforms + CHECK(etl::endianness()() != etl::endian::little); + CHECK(etl::endianness()() == etl::endian::big); - CHECK(etl::endianness::value() == etl::endian::little); - CHECK(etl::endianness::value() != etl::endian::big); + CHECK(etl::endianness::value() != etl::endian::little); + CHECK(etl::endianness::value() == etl::endian::big); + } + else + { + // Little endian platforms + CHECK(etl::endianness()() == etl::endian::little); + CHECK(etl::endianness()() != etl::endian::big); + + CHECK(etl::endianness::value() == etl::endian::little); + CHECK(etl::endianness::value() != etl::endian::big); + } +#else + #error Endianness unknown: Test not possible +#endif } }; } diff --git a/test/test_fnv_1.cpp b/test/test_fnv_1.cpp index b377ea87..a3f866e3 100644 --- a/test/test_fnv_1.cpp +++ b/test/test_fnv_1.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/fnv_1.h" +#include "etl/endianness.h" namespace { @@ -98,7 +99,15 @@ namespace TEST(test_fnv_1_32_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t hash1 = etl::fnv_1_32(data1.begin(), data1.end()); @@ -168,7 +177,15 @@ namespace TEST(test_fnv_1a_32_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t hash1 = etl::fnv_1a_32(data1.begin(), data1.end()); @@ -238,7 +255,15 @@ namespace TEST(test_fnv_1_64_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint64_t hash1 = etl::fnv_1_64(data1.begin(), data1.end()); @@ -308,7 +333,15 @@ namespace TEST(test_fnv_1a_64_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint64_t hash1 = etl::fnv_1a_64(data1.begin(), data1.end()); diff --git a/test/test_hash.cpp b/test/test_hash.cpp index c8eecc49..53567505 100644 --- a/test/test_hash.cpp +++ b/test/test_hash.cpp @@ -35,6 +35,7 @@ SOFTWARE. #include #include "etl/hash.h" +#include "etl/endianness.h" // for testing user-defined hash specializations namespace { class CustomType{}; } @@ -177,7 +178,14 @@ namespace if (ETL_PLATFORM_64BIT) { - CHECK_EQUAL(9821047038287739023U, hash); + if (etl::endianness::value() == etl::endian::little) + { + CHECK_EQUAL(9821047038287739023U, hash); + } + else + { + CHECK_EQUAL(15239628249615675935U, hash); + } } } diff --git a/test/test_jenkins.cpp b/test/test_jenkins.cpp index bd275b38..ed00abda 100644 --- a/test/test_jenkins.cpp +++ b/test/test_jenkins.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/jenkins.h" +#include "etl/endianness.h" template uint32_t jenkins(TIterator begin, TIterator end) @@ -123,7 +124,15 @@ namespace TEST(test_jenkins_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint32_t hash1 = etl::jenkins(data1.begin(), data1.end()); diff --git a/test/test_memory.cpp b/test/test_memory.cpp index 33bad7e9..4b70f3fe 100644 --- a/test/test_memory.cpp +++ b/test/test_memory.cpp @@ -31,6 +31,7 @@ SOFTWARE. #include "etl/memory.h" #include "etl/list.h" #include "etl/debug_count.h" +#include "etl/endianness.h" #include "data.h" @@ -1370,7 +1371,14 @@ namespace char* p2 = etl::mem_char(data, data + 8, (char)0x99); CHECK_EQUAL(uint32_t(0x29), uint32_t(*p1)); - CHECK((reinterpret_cast(data) + 18) == p1); + if (etl::endianness::value() == etl::endian::little) + { + CHECK((reinterpret_cast(data) + 18) == p1); + } + else + { + CHECK((reinterpret_cast(data) + 17) == p1); + } CHECK((reinterpret_cast(data) + 32) == p2); } @@ -1383,7 +1391,14 @@ namespace const char* p2 = etl::mem_char(data, data + 8, (char)0x99); CHECK_EQUAL(uint32_t(0x29), uint32_t(*p1)); - CHECK((reinterpret_cast(data) + 18) == p1); + if (etl::endianness::value() == etl::endian::little) + { + CHECK((reinterpret_cast(data) + 18) == p1); + } + else + { + CHECK((reinterpret_cast(data) + 17) == p1); + } CHECK((reinterpret_cast(data) + 32) == p2); } @@ -1396,7 +1411,14 @@ namespace char* p2 = etl::mem_char(data, 8, (char)0x99); CHECK_EQUAL(uint32_t(0x29), uint32_t(*p1)); - CHECK((reinterpret_cast(data) + 18) == p1); + if (etl::endianness::value() == etl::endian::little) + { + CHECK((reinterpret_cast(data) + 18) == p1); + } + else + { + CHECK((reinterpret_cast(data) + 17) == p1); + } CHECK((reinterpret_cast(data) + 32) == p2); } @@ -1409,7 +1431,14 @@ namespace const char* p2 = etl::mem_char(data, 8, (char)0x99); CHECK_EQUAL(uint32_t(0x29), uint32_t(*p1)); - CHECK((reinterpret_cast(data) + 18) == p1); + if (etl::endianness::value() == etl::endian::little) + { + CHECK((reinterpret_cast(data) + 18) == p1); + } + else + { + CHECK((reinterpret_cast(data) + 17) == p1); + } CHECK((reinterpret_cast(data) + 32) == p2); } diff --git a/test/test_murmur3.cpp b/test/test_murmur3.cpp index e634644c..5a6da403 100644 --- a/test/test_murmur3.cpp +++ b/test/test_murmur3.cpp @@ -39,6 +39,7 @@ SOFTWARE. #include "etl/murmur3.h" #include "etl/alignment.h" +#include "etl/endianness.h" namespace { @@ -110,7 +111,15 @@ namespace TEST(test_murmur3_32_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } uint32_t hash1 = etl::murmur3(data1.begin(), data1.end()); uint32_t hash2 = etl::murmur3((uint8_t*)&data2[0], (uint8_t*)&data2[0] + (data2.size() * sizeof(uint32_t))); diff --git a/test/test_pearson.cpp b/test/test_pearson.cpp index 38e07f4d..06cddab7 100644 --- a/test/test_pearson.cpp +++ b/test/test_pearson.cpp @@ -35,6 +35,7 @@ SOFTWARE. #include #include "etl/pearson.h" +#include "etl/endianness.h" const size_t HASH_SIZE = 8; typedef etl::pearson::value_type hash_t; @@ -155,7 +156,15 @@ namespace TEST(test_pearson_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; hash_t hash1 = etl::pearson(data1.begin(), data1.end()); diff --git a/test/test_xor_rotate_checksum.cpp b/test/test_xor_rotate_checksum.cpp index 4eed3347..94fd886f 100644 --- a/test/test_xor_rotate_checksum.cpp +++ b/test/test_xor_rotate_checksum.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/checksum.h" +#include "etl/endianness.h" namespace { @@ -135,7 +136,15 @@ namespace TEST(test_checksum_add_range_endian) { std::vector data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U }; - std::vector data2 = { 0x04030201UL, 0x08070605UL }; + std::vector data2; + if (etl::endianness::value() == etl::endian::little) + { + data2 = { 0x04030201UL, 0x08070605UL }; + } + else + { + data2 = { 0x01020304UL, 0x05060708UL }; + } std::vector data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U }; uint64_t hash1 = etl::xor_rotate_checksum(data1.begin(), data1.end());