diff --git a/cmake/modules/TestSuite.cmake b/cmake/modules/TestSuite.cmake --- a/cmake/modules/TestSuite.cmake +++ b/cmake/modules/TestSuite.cmake @@ -59,7 +59,8 @@ add_test_custom_target(${TARGET} TEST_COMMAND "${CMAKE_SOURCE_DIR}/cmake/utils/test_wrapper.sh" - "$" "${NAME}.log" ${ARGN} + "${NAME}.log" + ${CMAKE_CROSSCOMPILING_EMULATOR} "$" ${ARGN} CUSTOM_TARGET_ARGS COMMENT "${SUITE}: testing ${NAME}" DEPENDS ${EXECUTABLE} diff --git a/cmake/utils/test_wrapper.sh b/cmake/utils/test_wrapper.sh --- a/cmake/utils/test_wrapper.sh +++ b/cmake/utils/test_wrapper.sh @@ -7,8 +7,7 @@ # The stdout and stderr outputs are redirected to the file, which is only # printed on error. -EXECUTABLE="$1" -LOG="$2" -shift 2 +LOG="$1" +shift 1 -"${EXECUTABLE}" "$@" > "${LOG}" 2>&1 || (cat "${LOG}" && exit 1) +"$@" > "${LOG}" 2>&1 || (cat "${LOG}" && exit 1)