From d798c6ef0ae9fe9b1efacbf57135f9796927809e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonny=20Sv=C3=A4rd?= <jonny.svaerd@arm.com>
Date: Tue, 24 May 2022 13:23:00 +0200
Subject: Bugfix for tarmac traces being always enabled

Change-Id: Ide11895f0ce96d48d14210253c25d2ac624cf856
---
 targets/corstone-300/CMakeLists.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/targets/corstone-300/CMakeLists.txt b/targets/corstone-300/CMakeLists.txt
index a409a97..b129b71 100644
--- a/targets/corstone-300/CMakeLists.txt
+++ b/targets/corstone-300/CMakeLists.txt
@@ -60,11 +60,18 @@ include(CTest)
 set(Python3_FIND_STRATEGY LOCATION)
 find_package(Python3 COMPONENTS Interpreter)
 ethosu_get_architecture(${ETHOSU_TARGET_NPU_CONFIG})
-set(ETHOSU_COMMAND_DEFAULT ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/run_ctest.py
+set(ETHOSU_COMMAND_OPTIONS
         -t corstone-300
         -a ethos-${ETHOSU_ARCH}
         -m ${ETHOSU_NUM_MACS}
-        $<$<BOOL:ETHOSU_CTEST_TARMAC_TRACE>:--tarmac>
+        CACHE INTERNAL "Default test command options")
+
+if (ETHOSU_CTEST_TARMAC_TRACE)
+    list(APPEND ETHOSU_COMMAND_OPTIONS "--tarmac")
+endif()
+
+set(ETHOSU_COMMAND_DEFAULT ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/run_ctest.py
+        ${ETHOSU_COMMAND_OPTIONS}
     CACHE INTERNAL "Default test command")
 
 # Enable trustzone support in core_software
-- 
cgit v1.2.1