Merge topic 'test-RunCMake-updates'

c0d8e715 RunCMake: Allow specifying the stderr file for a test. 68d29f51 RunCMake: Allow specifying the directory to run tests in. 1c3918ff RunCMake: Remove unneeded files.
2015-02-10 10:09:47 -05:00 · 2015-02-10 10:09:47 -05:00 · 2fd44b082b
parent d46e1e3f0f c0d8e71591
commit 2fd44b082b
59 changed files with 18 additions and 61 deletions
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
+++ b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
+++ b/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
+++ b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
+++ b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
+++ b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
+++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
+++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
+++ b/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
+++ b/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
+++ b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
+++ b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
+++ b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
+++ b/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
+++ b/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@ -1,17 +1,28 @@
 # See adjacent README.rst for documentation of this test infrastructure.

 macro(add_RunCMake_test test)
+  set(TEST_ARGS ${ARGN})
+  if ("${ARGV1}" STREQUAL "TEST_DIR")
+    if ("${ARGV2}" STREQUAL "")
+      message(FATAL_ERROR "Invalid args")
+    endif()
+    set(Test_Dir ${ARGV2})
+    list(REMOVE_AT TEST_ARGS 0)
+    list(REMOVE_AT TEST_ARGS 0)
+  else()
+    set(Test_Dir ${test})
+  endif()
  add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND}
    -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
    -DRunCMake_GENERATOR=${CMAKE_GENERATOR}
    -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
    -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
    -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
+    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
    -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
    ${${test}_ARGS}
-    ${ARGN}
-    -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
+    ${TEST_ARGS}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
    )
 endmacro()

--- a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
+++ b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
+++ b/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
+++ b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
+++ b/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
+++ b/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
+++ b/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@ -18,7 +18,10 @@ function(run_cmake test)
    set(expect_result 0)
  endif()
  foreach(o out err)
-    if(EXISTS ${top_src}/${test}-std${o}.txt)
+    if(RunCMake-std${o}-file AND EXISTS ${top_src}/${RunCMake-std${o}-file})
+      file(READ ${top_src}/${RunCMake-std${o}-file} expect_std${o})
+      string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
+    elseif(EXISTS ${top_src}/${test}-std${o}.txt)
      file(READ ${top_src}/${test}-std${o}.txt expect_std${o})
      string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
    else()
--- a/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
+++ b/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
+++ b/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
+++ b/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
+++ b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
+++ b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
+++ b/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
+++ b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
+++ b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
+++ b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
+++ b/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
+++ b/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
+++ b/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/interface_library/genex_link-stderr.txt
+++ b/Tests/RunCMake/interface_library/genex_link-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
+++ b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/message/nomessage-stderr.txt
+++ b/Tests/RunCMake/message/nomessage-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
+++ b/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
@ -1 +0,0 @@
-^$
--- a/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
+++ b/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
@ -1 +0,0 @@
-^$