diff --git a/tests/debug/CMakeLists.txt b/tests/debug/CMakeLists.txt index 9f4f7b81..37172f4a 100644 --- a/tests/debug/CMakeLists.txt +++ b/tests/debug/CMakeLists.txt @@ -5,7 +5,7 @@ set(DEBUG_TESTS foreach(TEST ${DEBUG_TESTS}) configure_file("${TEST}" "${TEST}" COPYONLY) add_test(NAME "${TEST}" - COMMAND sh -c "${CMAKE_CURRENT_BINARY_DIR}/${TEST} 2> ${TESTDIR}/logs/${TEST}.log" + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${TEST} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") set_tests_properties("${TEST}" PROPERTIES LABELS "debug") set_tests_properties("${TEST}" PROPERTIES SKIP_RETURN_CODE 255) diff --git a/tests/debug/test_xdd_debug_init.sh b/tests/debug/test_xdd_debug_init.sh index 73d720d7..ad4d74b2 100755 --- a/tests/debug/test_xdd_debug_init.sh +++ b/tests/debug/test_xdd_debug_init.sh @@ -16,16 +16,16 @@ initialize_test echo "Foobar and I am here motherfucker" -xdd_cmd="${XDDTEST_XDD_EXE} -op write -reqsize 128 -numreqs 1 -targets 1 /dev/null -verbose -debug INIT" -${xdd_cmd} 2>&1 | grep "bound to NUMA node" +${XDDTEST_XDD_EXE} -op write -reqsize 128 -numreqs 1 -targets 1 /dev/null -verbose -debug INIT \ + 2>&1 | grep "bound to NUMA node" if [[ $? -ne 0 ]]; then # test failed finalize_test 1 fi -xdd_cmd="${XDDTEST_XDD_EXE} -op write -reqsize 128 -numreqs 1 -targets 1 /dev/null -verbose" -${xdd_cmd} 2>&1 | grep "bound to NUMA node" +${XDDTEST_XDD_EXE} -op write -reqsize 128 -numreqs 1 -targets 1 /dev/null -verbose \ + 2>&1 | grep "bound to NUMA node" if [[ $? -ne 1 ]]; then # test failed diff --git a/tests/functional/CMakeLists.txt b/tests/functional/CMakeLists.txt index 8ad1ee3a..1febdb83 100644 --- a/tests/functional/CMakeLists.txt +++ b/tests/functional/CMakeLists.txt @@ -21,7 +21,7 @@ set(FUNCTIONAL foreach(TEST ${FUNCTIONAL}) configure_file("${TEST}" "${TEST}" COPYONLY) add_test(NAME "${TEST}" - COMMAND sh -c "${CMAKE_CURRENT_BINARY_DIR}/${TEST} 2> ${TESTDIR}/logs/${TEST}.log" + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${TEST} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") set_tests_properties("${TEST}" PROPERTIES LABELS "functional") set_tests_properties("${TEST}" PROPERTIES SKIP_RETURN_CODE 255)