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 /zephyr/test/drivers/CMakeLists.txt | |
parent | 6c1587ca70f558b4f96b3f0b18ad8b027d3ba99d (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-c453fd704268ef72de871b0c5ac7a989de662334.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 'zephyr/test/drivers/CMakeLists.txt')
-rw-r--r-- | zephyr/test/drivers/CMakeLists.txt | 128 |
1 files changed, 59 insertions, 69 deletions
diff --git a/zephyr/test/drivers/CMakeLists.txt b/zephyr/test/drivers/CMakeLists.txt index 33163427b5..9e51295d4d 100644 --- a/zephyr/test/drivers/CMakeLists.txt +++ b/zephyr/test/drivers/CMakeLists.txt @@ -1,79 +1,69 @@ -# Copyright 2021 The Chromium OS Authors. All rights reserved. +# Copyright 2021 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. cmake_minimum_required(VERSION 3.13.1) -find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) +find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}") project(drivers) -# Include the local test directory for shimmed_test_tasks.h -zephyr_include_directories("${CMAKE_CURRENT_SOURCE_DIR}") -zephyr_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") -zephyr_include_directories("${PLATFORM_EC}/driver/ppc/") +add_subdirectory(common) -target_sources(app PRIVATE - src/battery.c - src/bb_retimer.c - src/bc12.c - src/bma2x2.c - src/bmi160.c - src/bmi260.c - src/charge_manager.c - src/chargesplash.c - src/console_cmd/charge_manager.c - src/console_cmd/charge_state.c - src/console_cmd/accelinit.c - src/console_cmd/accelinfo.c - src/console_cmd/accelspoof.c - src/console_cmd/accelrate.c - src/console_cmd/accelrange.c - src/console_cmd/accelread.c - src/console_cmd/accelres.c - src/console_cmd/usb_pd_console.c - src/cros_cbi.c - src/espi.c - src/gpio.c - src/host_cmd/motion_sense.c - src/integration/usbc/usb.c - src/integration/usbc/usb_20v_3a_pd_charger.c - src/integration/usbc/usb_5v_3a_pd_sink.c - src/integration/usbc/usb_5v_3a_pd_source.c - src/integration/usbc/usb_alt_mode.c - src/integration/usbc/usb_attach_src_snk.c - src/integration/usbc/usb_pd_ctrl_msg.c - src/integration/usbc/usb_malfunction_sink.c - src/i2c_passthru.c - src/isl923x.c - src/keyboard_scan.c - src/lid_switch.c - src/lis2dw12.c - src/ln9310.c - src/main.c - src/motion_sense/motion_sense.c - src/panic.c - src/power_common.c - src/ppc_sn5s330.c - src/ppc_syv682x.c - src/ps8xxx.c - src/smart.c - src/stm_mems_common.c - src/stubs.c - src/tcpci.c - src/tcpci_test_common.c - src/tcs3400.c - src/temp_sensor.c - src/test_mocks.c - src/test_rules.c - src/thermistor.c - src/uart_hostcmd.c - src/usb_mux.c - src/usb_pd_host_cmd.c - src/utils.c - src/vboot_hash.c - src/watchdog.c -) +get_target_property(TEST_SOURCES app SOURCES) -add_subdirectory(isl923x) -add_subdirectory(led_driver) +# Support zmake for now +if("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers") + set(CONFIG_LINK_TEST_SUITE_DEFAULT TRUE) + set(CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_DEFAULT=1) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK=1) +elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-ap_mux_control") + set(CONFIG_LINK_TEST_SUITE_AP_MUX_CONTROL TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_AP_MUX_CONTROL=1) +elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-usb_retimer_fw_update") + set(CONFIG_LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE=1) +elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-chargesplash") + set(CONFIG_LINK_TEST_SUITE_CHARGESPLASH TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_CHARGESPLASH=1) +elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-isl923x") + set(CONFIG_LINK_TEST_SUITE_ISL923X TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_ISL923X=1) +elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-led_driver") + set(CONFIG_LINK_TEST_SUITE_LED_DRIVER TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_LED_DRIVER=1) +elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-dps") + set(CONFIG_LINK_TEST_SUITE_USB_PD_DPS TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_USB_PD_DPS=1) +elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-usbc_alt_mode") + set(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE=1) +elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-usbc_tbt_mode") + set(CONFIG_LINK_TEST_SUITE_USBC_TBT_MODE TRUE) + add_compile_definitions(CONFIG_LINK_TEST_SUITE_USBC_TBT_MODE=1) +endif() + +# Add linked suites here +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_DEFAULT default) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_AP_MUX_CONTROL ap_mux_control) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_CHARGESPLASH chargesplash) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_ISL923X isl923x) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_KEYBOARD_SCAN keyboard_scan) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_LED_DRIVER led_driver) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_MKBP mkbp) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK usb_malfunction_sink) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_PD_DPS dps) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE usb_retimer_fw_update) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE usbc_alt_mode) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USBC_TBT_MODE usbc_tbt_mode) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_USBC_OCP usbc_ocp) +add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_HOST_COMMANDS host_cmd) + +get_target_property(TEST_SOURCES_NEW app SOURCES) + +# Check to make sure at least one suite was added +list(REMOVE_ITEM TEST_SOURCES_NEW ${TEST_SOURCES}) +if(NOT TEST_SOURCES_NEW) + message(FATAL_ERROR "Invalid configuration, must add test sources") +endif() set_compiler_property(APPEND PROPERTY coverage -O0) |