mirror of
https://github.com/Kitware/CMake.git
synced 2026-07-01 04:07:15 +00:00
Tests/RunCMake: Prefer RunCMake_TEST_EXPECT_* if set
Allow local expectation overrides.
This commit is contained in:
@@ -24,11 +24,11 @@ function(run_cmake test)
|
||||
|
||||
set(top_src "${RunCMake_SOURCE_DIR}")
|
||||
set(top_bin "${RunCMake_BINARY_DIR}")
|
||||
if(EXISTS ${top_src}/${test}-result.txt)
|
||||
if(DEFINED RunCMake_TEST_EXPECT_RESULT)
|
||||
set(expect_result "${RunCMake_TEST_EXPECT_RESULT}")
|
||||
elseif(EXISTS ${top_src}/${test}-result.txt)
|
||||
file(READ ${top_src}/${test}-result.txt expect_result)
|
||||
string(REGEX REPLACE "\n+$" "" expect_result "${expect_result}")
|
||||
elseif(DEFINED RunCMake_TEST_EXPECT_RESULT)
|
||||
set(expect_result "${RunCMake_TEST_EXPECT_RESULT}")
|
||||
else()
|
||||
set(expect_result 0)
|
||||
endif()
|
||||
@@ -43,7 +43,9 @@ function(run_cmake test)
|
||||
endif()
|
||||
|
||||
foreach(o IN ITEMS stdout stderr config)
|
||||
if(RunCMake-${o}-file AND EXISTS ${top_src}/${RunCMake-${o}-file})
|
||||
if(DEFINED RunCMake_TEST_EXPECT_${o})
|
||||
string(REGEX REPLACE "\n+$" "" expect_${o} "${RunCMake_TEST_EXPECT_${o}}")
|
||||
elseif(RunCMake-${o}-file AND EXISTS ${top_src}/${RunCMake-${o}-file})
|
||||
file(READ ${top_src}/${RunCMake-${o}-file} expect_${o})
|
||||
string(REGEX REPLACE "\n+$" "" expect_${o} "${expect_${o}}")
|
||||
elseif(EXISTS ${top_src}/${test}-${o}-${platform_name}.txt)
|
||||
@@ -52,8 +54,6 @@ function(run_cmake test)
|
||||
elseif(EXISTS ${top_src}/${test}-${o}.txt)
|
||||
file(READ ${top_src}/${test}-${o}.txt expect_${o})
|
||||
string(REGEX REPLACE "\n+$" "" expect_${o} "${expect_${o}}")
|
||||
elseif(DEFINED RunCMake_TEST_EXPECT_${o})
|
||||
string(REGEX REPLACE "\n+$" "" expect_${o} "${RunCMake_TEST_EXPECT_${o}}")
|
||||
else()
|
||||
unset(expect_${o})
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user