diff options
| author | Liam Barry <liam.barry@arm.com> | 2023-11-03 15:49:34 +0000 |
|---|---|---|
| committer | Liam Barry <liam.barry@arm.com> | 2023-11-20 15:24:42 +0000 |
| commit | cca34a93798c52bffd41b07ead3595f398005e14 (patch) | |
| tree | 052cd8ceb1faa7d1b6e35bdf6b735c5f3a81a040 /scripts | |
| parent | 4865c4fc171d6b0eb6e2b470f123ff81e45a34f8 (diff) | |
| download | ml-embedded-evaluation-kit-cca34a93798c52bffd41b07ead3595f398005e14.tar.gz | |
MLECO-4490: Upgrade MLEK Catch Unit tests
*Removed default behaviour of unit-test executables to redirect output
to file.
*Accompanying change made to CI script to generate xml files there instead.
*Switched to newer minor version of Catch.
*Note: Support for simultaneous output to console and file is available in new major version (Catch 3).
Other unit test cleanup:
* Redundant warnings about common tests output removed
* Static cast added to silence compiler warning
* Removed additional printing in RNNoiseModelTests
Signed-off-by: Liam Barry <liam.barry@arm.com>
Change-Id: If9d7f366ec205a7cd49a45198a15867ef7b75afd
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/platforms/native/build_configuration.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/cmake/platforms/native/build_configuration.cmake b/scripts/cmake/platforms/native/build_configuration.cmake index d0b4dfb..0519ec1 100644 --- a/scripts/cmake/platforms/native/build_configuration.cmake +++ b/scripts/cmake/platforms/native/build_configuration.cmake @@ -1,5 +1,5 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2022 Arm Limited and/or its affiliates <open-source-office@arm.com> +# SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com> # SPDX-License-Identifier: Apache-2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,16 +21,15 @@ function(set_platform_global_defaults) set(CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_DIR}/native-gcc.cmake CACHE FILEPATH "Toolchain file") endif() - set(PLATFORM_DRIVERS_DIR "${HAL_PLATFORM_DIR}/native" PARENT_SCOPE) set(TEST_TPIP ${DOWNLOAD_DEP_DIR}/test) file(MAKE_DIRECTORY ${TEST_TPIP}) set(TEST_TPIP_INCLUDE ${TEST_TPIP}/include) file(MAKE_DIRECTORY ${TEST_TPIP_INCLUDE}) - set(CATCH_HEADER_URL "https://github.com/catchorg/Catch2/releases/download/v2.11.1/catch.hpp") - set(CATCH_HEADER_MD5 dc6bb8ce282ad134476b37275804c44c) + set(CATCH_HEADER_URL "https://github.com/catchorg/Catch2/releases/download/v2.13.5/catch.hpp") + set(CATCH_HEADER_MD5 b43c586fe617aefdee3e480e9fa8f370) include(FetchContent) FetchContent_Declare(catch2-header-download @@ -116,6 +115,6 @@ function(platform_custom_post_build) target_compile_definitions(${TEST_TARGET_NAME} PRIVATE "ACTIVATION_BUF_SZ=${${use_case}_ACTIVATION_BUF_SZ}" TESTS) - add_test(NAME "${use_case}-tests" COMMAND ${TEST_TARGET_NAME} -r junit -o ${TEST_TARGET_NAME}.xml) + add_test(NAME "${use_case}-tests" COMMAND ${TEST_TARGET_NAME}) endif () -endfunction()
\ No newline at end of file +endfunction() |