diff options
| author | Brad King <brad.king@kitware.com> | 2013-02-25 18:11:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-02-25 18:11:51 (GMT) |
| commit | 05e1b3c17d45320410ef8c7e080a33766ca63c2a (patch) | |
| tree | aea5dba000604d6a73c31397d4c39e75af542fe8 /Tests/Module | |
| parent | e674af906ac5b18883c1a180434286b1e519de4d (diff) | |
| parent | 55f0148d7b2b5815add052d00b9835dd9c16feae (diff) | |
| download | CMake-05e1b3c17d45320410ef8c7e080a33766ca63c2a.zip CMake-05e1b3c17d45320410ef8c7e080a33766ca63c2a.tar.gz CMake-05e1b3c17d45320410ef8c7e080a33766ca63c2a.tar.bz2 | |
Merge topic 'ExternalData-spaces'
55f0148 ExternalData: Test content link with a space in its name
d45eb35 Tests: Generalize decision for 'make' tool supporting spaces
ef8b2fd Tests: Replace exec_program with execute_process
Diffstat (limited to 'Tests/Module')
| -rw-r--r-- | Tests/Module/ExternalData/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/Module/ExternalData/Data Space.dat.md5 | 1 | ||||
| -rw-r--r-- | Tests/Module/ExternalData/Data1Check.cmake | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Tests/Module/ExternalData/CMakeLists.txt b/Tests/Module/ExternalData/CMakeLists.txt index 607e9b9..a379dca 100644 --- a/Tests/Module/ExternalData/CMakeLists.txt +++ b/Tests/Module/ExternalData/CMakeLists.txt @@ -14,10 +14,15 @@ set(ExternalData_URL_TEMPLATES set(ExternalData_BINARY_ROOT "${CMAKE_CURRENT_BINARY_DIR}/ExternalData") file(REMOVE_RECURSE ${ExternalData_BINARY_ROOT}) # clean test +if(MAKE_SUPPORTS_SPACES) + set(Data1CheckSpaces -D "DataSpace=DATA{Data Space.dat}") +endif() + ExternalData_Add_Test(Data1 NAME Data1Check COMMAND ${CMAKE_COMMAND} -D Data=DATA{Data.dat} + ${Data1CheckSpaces} -D SeriesA=DATA{SeriesA.dat,:} -D SeriesB=DATA{SeriesB.dat,:} -D SeriesC=DATA{SeriesC.dat,:} diff --git a/Tests/Module/ExternalData/Data Space.dat.md5 b/Tests/Module/ExternalData/Data Space.dat.md5 new file mode 100644 index 0000000..70e39bd --- /dev/null +++ b/Tests/Module/ExternalData/Data Space.dat.md5 @@ -0,0 +1 @@ +8c018830e3efa5caf3c7415028335a57 diff --git a/Tests/Module/ExternalData/Data1Check.cmake b/Tests/Module/ExternalData/Data1Check.cmake index b99d7ae..f40b76c 100644 --- a/Tests/Module/ExternalData/Data1Check.cmake +++ b/Tests/Module/ExternalData/Data1Check.cmake @@ -2,6 +2,12 @@ file(STRINGS "${Data}" lines LIMIT_INPUT 1024) if(NOT "x${lines}" STREQUAL "xInput file already transformed.") message(SEND_ERROR "Input file:\n ${Data}\ndoes not have expected content, but [[${lines}]]") endif() +if(DEFINED DataSpace) + file(STRINGS "${DataSpace}" lines LIMIT_INPUT 1024) + if(NOT "x${lines}" STREQUAL "xInput file already transformed.") + message(SEND_ERROR "Input file:\n ${DataSpace}\ndoes not have expected content, but [[${lines}]]") + endif() +endif() set(SeriesAn1 "1\\.dat") set(SeriesBn1 "_1\\.dat") set(SeriesCn1 "\\.1\\.dat") |