diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-12-16 21:11:40 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-12-31 15:34:34 (GMT) |
| commit | 73ae888506c89b8c0619905f4c19b79116afb514 (patch) | |
| tree | c7af7e40b479536d725266181876cefb735947a9 /Tests/RunCMake/Languages | |
| parent | c2445d3dfd837cd2e372061f5545054317be110a (diff) | |
| download | CMake-73ae888506c89b8c0619905f4c19b79116afb514.zip CMake-73ae888506c89b8c0619905f4c19b79116afb514.tar.gz CMake-73ae888506c89b8c0619905f4c19b79116afb514.tar.bz2 | |
RunCMake: Expect empty output by default.
Expect tests to specify stderr content if it is present.
Fix the CMP0019 test, which has only been testing the WARN status
until now. Specify in the CommandLine and FPHSA tests that content
is at least one character.
Set policies in the Language and CheckModules tests, which have empty
test output, modulo unrelated policies on some platforms.
Diffstat (limited to 'Tests/RunCMake/Languages')
| -rw-r--r-- | Tests/RunCMake/Languages/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Tests/RunCMake/Languages/CMakeLists.txt b/Tests/RunCMake/Languages/CMakeLists.txt index 12cd3c7..8996fef 100644 --- a/Tests/RunCMake/Languages/CMakeLists.txt +++ b/Tests/RunCMake/Languages/CMakeLists.txt @@ -1,3 +1,4 @@ cmake_minimum_required(VERSION 2.8.4) +cmake_policy(SET CMP0042 NEW) project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt b/Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt index 3a7f480..03c002e 100644 --- a/Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt +++ b/Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt @@ -6,4 +6,4 @@ CMake Error at LINK_LANGUAGE-genex.cmake:[0-9]+ \(target_link_libraries\): LINKER_LANGUAGE target property can not be used while evaluating link libraries for a static library Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) + CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt b/Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt index d8bc238..be3b12c 100644 --- a/Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt +++ b/Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt @@ -6,4 +6,4 @@ CMake Error at link-libraries-TARGET_FILE-genex.cmake:[0-9]+ \(target_link_libra Expressions which require the linker language may not be used while evaluating link libraries Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) + CMakeLists.txt:[0-9]+ \(include\) |