summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-11-15 16:35:29 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-11-15 16:35:29 (GMT)
commitcd7057b21ca699ade836c780080a81988c84cac6 (patch)
treecd1e44fd2f57d0d231c3fe2ec222dee729c2008a /config
parent0c589bf7b56738d9c643718be5f12a72a1e39e83 (diff)
downloadhdf5-cd7057b21ca699ade836c780080a81988c84cac6.zip
hdf5-cd7057b21ca699ade836c780080a81988c84cac6.tar.gz
hdf5-cd7057b21ca699ade836c780080a81988c84cac6.tar.bz2
[svn-r19782] Fix CMake testing for links_env test which requires an environment variable at test run-time. Modified runTest.cmake file to allow optional ENV_VAR and ENV_VALUE to be passed. runTest.cmake requires a reference file, added links_env.out to testfiles folder.
Also updated root CMakeLists.txt to output a message when unsopported options are configured with the PARALLEL option. CMake will still generate files. Tested: windows and local linux
Diffstat (limited to 'config')
-rw-r--r--config/cmake/runTest.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index c9334c1..e65e877 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -28,6 +28,10 @@ SET (ERROR_APPEND 1)
MESSAGE (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+IF (TEST_ENV_VAR)
+ SET (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
+ENDIF (TEST_ENV_VAR)
+
# run the test program, capture the stdout/stderr and the result var
EXECUTE_PROCESS (
COMMAND ${TEST_PROGRAM} ${TEST_ARGS}