Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "install tests environment properties (#390)" #391

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions rapids-cmake/test/install_relocatable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,16 @@ function(rapids_test_install_relocatable)

foreach(test IN LISTS tests_to_run)
get_test_property(${test} INSTALL_COMMAND command)
get_test_property(${test} RESOURCE_GROUPS resources)
get_test_property(${test} LABELS labels)
string(APPEND content "add_test([=[${test}]=] ${command})\n")

set(properties_to_record ENVIRONMENT ENVIRONMENT_MODIFICATION RESOURCE_GROUPS LABELS)
foreach(prop_name IN LISTS properties_to_record)
get_test_property(${test} ${prop_name} prop_value)
if(prop_value)
string(APPEND content
"set_tests_properties([=[${test}]=] PROPERTIES ${prop_name} ${prop_value})\n")
endif()
endforeach()
if(resources)
string(APPEND content
"set_tests_properties([=[${test}]=] PROPERTIES RESOURCE_GROUPS ${resources})\n")
endif()
if(labels)
string(APPEND content "set_tests_properties([=[${test}]=] PROPERTIES LABELS ${labels})\n")
endif()
endforeach()

set(test_launcher_file
Expand Down
1 change: 0 additions & 1 deletion testing/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ add_cmake_config_test(init-simple.cmake)

set(wrong_component_message "No install component set [wrong_component] can be found")
add_cmake_build_test(install_relocatable-include-in-all.cmake)
add_cmake_build_test(install_relocatable-env-vars.cmake)
add_cmake_build_test(install_relocatable-labels.cmake)
add_cmake_config_test(install_relocatable-simple.cmake)
add_cmake_config_test(install_relocatable-wrong-component.cmake SHOULD_FAIL "${wrong_component_message}")
Expand Down
43 changes: 0 additions & 43 deletions testing/test/install_relocatable-env-vars.cmake

This file was deleted.