Skip to content

Commit

Permalink
Remove explicit location of config files in ctest tests
Browse files Browse the repository at this point in the history
The build directory now mimics the install directory, and the
instrumentors should be able to locate the default config file on
their own.
  • Loading branch information
zbeekman committed Jan 27, 2025
1 parent 834194f commit 206a2b5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ if(HAVE_TAU)
endif()

set(test_path ${CMAKE_SOURCE_DIR}/tests/${TEST_BASE_NAME}.${TEST_LANG})
set(TAUC_OPTS -optVerbose -optSaltInst -optSaltParser=${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/saltfm -optSaltConfigFile=${CMAKE_SOURCE_DIR}/config_files/tau_config.yaml)
set(TAUC_OPTS -optVerbose -optSaltInst -optSaltParser=${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/saltfm)
set(compile_opts ${TAU_COMPILE_OPTIONS})
foreach(comp IN LISTS compilers_to_test)
set(lower_comp ${comp})
Expand Down Expand Up @@ -626,7 +626,7 @@ foreach(test_source IN LISTS FORTRAN_TESTS_SOURCES_LIST)
set_tests_properties(instrument_${test_source}
PROPERTIES
REQUIRED_FILES "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/fparse-llvm;${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/saltfm"
ENVIRONMENT "SALT_FORTRAN_CONFIG_FILE=${CMAKE_SOURCE_DIR}/config_files/tau_config.yaml;SALT_FORTRAN_VERBOSE=1"
ENVIRONMENT "SALT_FORTRAN_VERBOSE=1"
PASS_REGULAR_EXPRESSION "SALT Instrumentor Plugin finished"
)
endforeach()
Expand Down

0 comments on commit 206a2b5

Please sign in to comment.