From bf163dea7e237dee4d12505e7e35d07a2ab751bc Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 28 Jan 2018 14:54:20 -0600 Subject: [PATCH] CMake: use custom directory4 --- test/CMakeLists.txt | 4 ++-- test/test_helper.cmake | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4e7b9f3d3..f5cbd544d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -23,14 +23,14 @@ foreach(float_type ${float_types}) COMMAND ${CMAKE_COMMAND} "-DTEST_COMMAND=$" "-DTEST_INPUT=${PROJECT_SOURCE_DIR}/test/${float_type}blat2.dat" - "-DTEST_FILE=${float_type_upper}BLAT2.SUMM" + "-DTEST_FILE=${CMAKE_BINARY_DIR}/test/${float_type}blas2/${float_type_upper}BLAT2.SUMM" -P "${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cmake" ) add_test(NAME "${float_type}blas3" COMMAND ${CMAKE_COMMAND} "-DTEST_COMMAND=$" "-DTEST_INPUT=${PROJECT_SOURCE_DIR}/test/${float_type}blat3.dat" - "-DTEST_FILE=${float_type_upper}BLAT3.SUMM" + "-DTEST_FILE=${CMAKE_BINARY_DIR}/test/${float_type}blas2/${float_type_upper}BLAT3.SUMM" -P "${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cmake" ) endforeach() diff --git a/test/test_helper.cmake b/test/test_helper.cmake index 4724ea6d1..6dfe63a78 100644 --- a/test/test_helper.cmake +++ b/test/test_helper.cmake @@ -1,6 +1,9 @@ +get_filename_component(TEST_DIRECTORY ${TEST_FILE} DIRECTORY) +file(MAKE_DIRECTORY ${TEST_DIRECTORY}) file(REMOVE ${TEST_FILE}) execute_process(COMMAND ${TEST_COMMAND} INPUT_FILE ${TEST_INPUT} + WORKING_DIRECTORY ${TEST_DIRECTORY} ) FILE(READ ${TEST_FILE} TEST_FILE_CONTENTS) STRING(FIND "${TEST_FILE_CONTENTS}" "FATAL" CONTAINS_FATAL)