diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:08:36 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:59:38 -0700 |
commit | c453fd704268ef72de871b0c5ac7a989de662334 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /test/utils.c | |
parent | 6c1587ca70f558b4f96b3f0b18ad8b027d3ba99d (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-firmware-fpmcu-dartmonkey-release.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-releasefirmware-fpmcu-dartmonkey-release
Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file
./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release
Relevant changes:
git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
a0751778f4 board/nocturne_fp/ro_workarounds.c: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
58f0246dbe board/nocturne_fp/board_ro.c: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
84e53a65da board/nocturne_fp/board.h: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header
BRANCH=None
BUG=b:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
Test "aes": PASSED
Test "cec": PASSED
Test "cortexm_fpu": PASSED
Test "crc": PASSED
Test "flash_physical": PASSED
Test "flash_write_protect": PASSED
Test "fpsensor_hw": PASSED
Test "fpsensor_spi_ro": PASSED
Test "fpsensor_spi_rw": PASSED
Test "fpsensor_uart_ro": PASSED
Test "fpsensor_uart_rw": PASSED
Test "mpu_ro": PASSED
Test "mpu_rw": PASSED
Test "mutex": PASSED
Test "pingpong": PASSED
Test "printf": PASSED
Test "queue": PASSED
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Test "rtc": PASSED
Test "sha256": PASSED
Test "sha256_unrolled": PASSED
Test "static_if": PASSED
Test "stdlib": PASSED
Test "system_is_locked_wp_on": PASSED
Test "system_is_locked_wp_off": PASSED
Test "timer_dos": PASSED
Test "utils": PASSED
Test "utils_str": PASSED
Test "panic_data_dartmonkey_v2.0.2887": PASSED
Test "panic_data_nocturne_fp_v2.2.64": PASSED
Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7
Diffstat (limited to 'test/utils.c')
-rw-r--r-- | test/utils.c | 269 |
1 files changed, 84 insertions, 185 deletions
diff --git a/test/utils.c b/test/utils.c index 3fc70cdc75..fccfee0923 100644 --- a/test/utils.c +++ b/test/utils.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -14,171 +14,14 @@ #include "util.h" #include "watchdog.h" -static int test_memmove(void) -{ - int i; - timestamp_t t0, t1, t2, t3; - char *buf; - const int buf_size = 1000; - const int len = 400; - const int iteration = 1000; - - TEST_ASSERT(shared_mem_acquire(buf_size, &buf) == EC_SUCCESS); - - for (i = 0; i < len; ++i) - buf[i] = i & 0x7f; - for (i = len; i < buf_size; ++i) - buf[i] = 0; - - t0 = get_time(); - for (i = 0; i < iteration; ++i) - memmove(buf + 101, buf, len); /* unaligned */ - t1 = get_time(); - TEST_ASSERT_ARRAY_EQ(buf + 101, buf, len); - ccprintf(" (speed gain: %" PRId64 " ->", t1.val-t0.val); - - t2 = get_time(); - for (i = 0; i < iteration; ++i) - memmove(buf + 100, buf, len); /* aligned */ - t3 = get_time(); - ccprintf(" %" PRId64 " us) ", t3.val-t2.val); - TEST_ASSERT_ARRAY_EQ(buf + 100, buf, len); - - if (!IS_ENABLED(EMU_BUILD)) - TEST_ASSERT((t1.val - t0.val) > (t3.val - t2.val)); - - /* Test small moves */ - memmove(buf + 1, buf, 1); - TEST_ASSERT_ARRAY_EQ(buf + 1, buf, 1); - memmove(buf + 5, buf, 4); - memmove(buf + 1, buf, 4); - TEST_ASSERT_ARRAY_EQ(buf + 1, buf + 5, 4); - - shared_mem_release(buf); - return EC_SUCCESS; -} - -static int test_memcpy(void) -{ - int i; - timestamp_t t0, t1, t2, t3; - char *buf; - const int buf_size = 1000; - const int len = 400; - const int dest_offset = 500; - const int iteration = 1000; - - TEST_ASSERT(shared_mem_acquire(buf_size, &buf) == EC_SUCCESS); - - for (i = 0; i < len; ++i) - buf[i] = i & 0x7f; - for (i = len; i < buf_size; ++i) - buf[i] = 0; - - t0 = get_time(); - for (i = 0; i < iteration; ++i) - memcpy(buf + dest_offset + 1, buf, len); /* unaligned */ - t1 = get_time(); - TEST_ASSERT_ARRAY_EQ(buf + dest_offset + 1, buf, len); - ccprintf(" (speed gain: %" PRId64 " ->", t1.val-t0.val); - - t2 = get_time(); - for (i = 0; i < iteration; ++i) - memcpy(buf + dest_offset, buf, len); /* aligned */ - t3 = get_time(); - ccprintf(" %" PRId64 " us) ", t3.val-t2.val); - TEST_ASSERT_ARRAY_EQ(buf + dest_offset, buf, len); - - if (!IS_ENABLED(EMU_BUILD)) - TEST_ASSERT((t1.val - t0.val) > (t3.val - t2.val)); - - memcpy(buf + dest_offset + 1, buf + 1, len - 1); - TEST_ASSERT_ARRAY_EQ(buf + dest_offset + 1, buf + 1, len - 1); - - /* Test small copies */ - memcpy(buf + dest_offset, buf, 1); - TEST_ASSERT_ARRAY_EQ(buf + dest_offset, buf, 1); - memcpy(buf + dest_offset, buf, 4); - TEST_ASSERT_ARRAY_EQ(buf + dest_offset, buf, 4); - memcpy(buf + dest_offset + 1, buf, 1); - TEST_ASSERT_ARRAY_EQ(buf + dest_offset + 1, buf, 1); - memcpy(buf + dest_offset + 1, buf, 4); - TEST_ASSERT_ARRAY_EQ(buf + dest_offset + 1, buf, 4); - - shared_mem_release(buf); - return EC_SUCCESS; -} - -/* Plain memset, used as a reference to measure speed gain */ -static void *dumb_memset(void *dest, int c, int len) -{ - char *d = (char *)dest; - while (len > 0) { - *(d++) = c; - len--; - } - return dest; -} - -static int test_memset(void) -{ - int i; - timestamp_t t0, t1, t2, t3; - char *buf; - const int buf_size = 1000; - const int len = 400; - const int iteration = 1000; - - TEST_ASSERT(shared_mem_acquire(buf_size, &buf) == EC_SUCCESS); - - t0 = get_time(); - for (i = 0; i < iteration; ++i) - dumb_memset(buf, 1, len); - t1 = get_time(); - TEST_ASSERT_MEMSET(buf, (char)1, len); - ccprintf(" (speed gain: %" PRId64 " ->", t1.val-t0.val); - - t2 = get_time(); - for (i = 0; i < iteration; ++i) - memset(buf, 1, len); - t3 = get_time(); - TEST_ASSERT_MEMSET(buf, (char)1, len); - ccprintf(" %" PRId64 " us) ", t3.val-t2.val); - - if (!IS_ENABLED(EMU_BUILD)) - TEST_ASSERT((t1.val - t0.val) > (t3.val - t2.val)); - - memset(buf, 128, len); - TEST_ASSERT_MEMSET(buf, (char)128, len); - - memset(buf, -2, len); - TEST_ASSERT_MEMSET(buf, (char)-2, len); - - memset(buf + 1, 1, len - 2); - TEST_ASSERT_MEMSET(buf + 1, (char)1, len - 2); - - shared_mem_release(buf); - return EC_SUCCESS; -} - -static int test_memchr(void) -{ - char *buf = "1234"; - - TEST_ASSERT(memchr("123567890", '4', 8) == NULL); - TEST_ASSERT(memchr("123", '3', 2) == NULL); - TEST_ASSERT(memchr(buf, '3', 4) == buf + 2); - TEST_ASSERT(memchr(buf, '4', 4) == buf + 3); - return EC_SUCCESS; -} - static int test_uint64divmod_0(void) { uint64_t n = 8567106442584750ULL; int d = 54870071; int r = uint64divmod(&n, d); - TEST_CHECK(r == 5991285 && n == 156134415ULL); + TEST_ASSERT(r == 5991285 && n == 156134415ULL); + return EC_SUCCESS; } static int test_uint64divmod_1(void) @@ -187,7 +30,8 @@ static int test_uint64divmod_1(void) int d = 2; int r = uint64divmod(&n, d); - TEST_CHECK(r == 0 && n == 4283553221292375ULL); + TEST_ASSERT(r == 0 && n == 4283553221292375ULL); + return EC_SUCCESS; } static int test_uint64divmod_2(void) @@ -196,7 +40,8 @@ static int test_uint64divmod_2(void) int d = 0; int r = uint64divmod(&n, d); - TEST_CHECK(r == 0 && n == 0ULL); + TEST_ASSERT(r == 0 && n == 0ULL); + return EC_SUCCESS; } static int test_get_next_bit(void) @@ -361,25 +206,24 @@ static int test_mula32(void) } t1 = get_time(); - ccprintf("After %d iterations, r=%08x%08x, r2=%08x%08x (time: %d)\n", - i, (uint32_t)(r >> 32), (uint32_t)r, - (uint32_t)(r2 >> 32), (uint32_t)r2, t1.le.lo-t0.le.lo); - TEST_ASSERT(r == 0x9df59b9fb0ab9d96L); + ccprintf("After %d iterations, r=%08x%08x, r2=%08x%08x (time: %d)\n", i, + (uint32_t)(r >> 32), (uint32_t)r, (uint32_t)(r2 >> 32), + (uint32_t)r2, t1.le.lo - t0.le.lo); + TEST_ASSERT(r == 0x9df59b9fb0ab9d96L); TEST_ASSERT(r2 == 0x9df59b9fb0beabd6L); /* well okay then */ return EC_SUCCESS; } -#define SWAP_TEST_HARNESS(t, x, y) \ - do { \ - t a = x, b = y; \ - swap(a, b); \ +#define SWAP_TEST_HARNESS(t, x, y) \ + do { \ + t a = x, b = y; \ + swap(a, b); \ TEST_ASSERT(a == y); \ TEST_ASSERT(b == x); \ } while (0) - static int test_swap(void) { SWAP_TEST_HARNESS(uint8_t, UINT8_MAX, 0); @@ -455,15 +299,15 @@ test_static int test_alignment_log2(void) test_static int test_binary_first_base3_from_bits(void) { - int n0[] = {0, 0, 0}; /* LSB first */ - int n7[] = {1, 1, 1}; - int n8[] = {2, 0, 0}; - int n9[] = {2, 1, 0}; - int n10[] = {0, 2, 0}; - int n11[] = {1, 2, 0}; - int n18[] = {0, 0, 2}; - int n26[] = {2, 2, 2}; - int n38[] = {1, 2, 0, 1}; + int n0[] = { 0, 0, 0 }; /* LSB first */ + int n7[] = { 1, 1, 1 }; + int n8[] = { 2, 0, 0 }; + int n9[] = { 2, 1, 0 }; + int n10[] = { 0, 2, 0 }; + int n11[] = { 1, 2, 0 }; + int n18[] = { 0, 0, 2 }; + int n26[] = { 2, 2, 2 }; + int n38[] = { 1, 2, 0, 1 }; TEST_EQ(binary_first_base3_from_bits(n0, ARRAY_SIZE(n0)), 0, "%d"); TEST_EQ(binary_first_base3_from_bits(n7, ARRAY_SIZE(n7)), 7, "%d"); @@ -477,14 +321,68 @@ test_static int test_binary_first_base3_from_bits(void) return EC_SUCCESS; } -void run_test(int argc, char **argv) +test_static int test_parse_bool(void) +{ + int bool_val; + int rv; + + /* False cases. */ + + bool_val = 1; + rv = parse_bool("off", &bool_val); + TEST_EQ(rv, 1, "%d"); + TEST_EQ(bool_val, 0, "%d"); + + bool_val = 1; + rv = parse_bool("dis", &bool_val); + TEST_EQ(rv, 1, "%d"); + TEST_EQ(bool_val, 0, "%d"); + + bool_val = 1; + rv = parse_bool("f", &bool_val); + TEST_EQ(rv, 1, "%d"); + TEST_EQ(bool_val, 0, "%d"); + + bool_val = 1; + rv = parse_bool("n", &bool_val); + TEST_EQ(rv, 1, "%d"); + TEST_EQ(bool_val, 0, "%d"); + + /* True cases. */ + + bool_val = 0; + rv = parse_bool("on", &bool_val); + TEST_EQ(rv, 1, "%d"); + TEST_EQ(bool_val, 1, "%d"); + + bool_val = 0; + rv = parse_bool("ena", &bool_val); + TEST_EQ(rv, 1, "%d"); + TEST_EQ(bool_val, 1, "%d"); + + bool_val = 0; + rv = parse_bool("t", &bool_val); + TEST_EQ(rv, 1, "%d"); + TEST_EQ(bool_val, 1, "%d"); + + bool_val = 0; + rv = parse_bool("y", &bool_val); + TEST_EQ(rv, 1, "%d"); + TEST_EQ(bool_val, 1, "%d"); + + /* Error case. */ + bool_val = -1; + rv = parse_bool("a", &bool_val); + TEST_EQ(rv, 0, "%d"); + TEST_EQ(bool_val, -1, "%d"); + + return EC_SUCCESS; +} + +void run_test(int argc, const char **argv) { test_reset(); - RUN_TEST(test_memmove); - RUN_TEST(test_memcpy); - RUN_TEST(test_memset); - RUN_TEST(test_memchr); RUN_TEST(test_uint64divmod_0); RUN_TEST(test_uint64divmod_1); RUN_TEST(test_uint64divmod_2); @@ -499,6 +397,7 @@ void run_test(int argc, char **argv) RUN_TEST(test_safe_memcmp); RUN_TEST(test_alignment_log2); RUN_TEST(test_binary_first_base3_from_bits); + RUN_TEST(test_parse_bool); test_print_result(); } |