summaryrefslogtreecommitdiff
path: root/Tests
diff options
context:
space:
mode:
authorFrank Winklmeier <frank.winklmeier@cern.ch>2022-09-05 13:42:40 +0200
committerFrank Winklmeier <frank.winklmeier@cern.ch>2022-09-05 13:42:40 +0200
commitcb55d5e730f8f40c2ba5ecf4771575117c56ef0c (patch)
tree7112707c7d00f249840315ababc64fef299633dd /Tests
parent0e7bb4e783f596a1995d3a713682e6a54a41781e (diff)
downloadcmake-cb55d5e730f8f40c2ba5ecf4771575117c56ef0c.tar.gz
RunCMakeTest: fix Truncation test definition
The `ctest_test` and `CTestCommandLine` truncation tests had multiple problems: - escape expected result string to avoid regex matching - specify the truncation size - pass the truncation mode correctly into the test definition - use unique test names Issue: #23868
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake2
-rw-r--r--Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-check.cmake1
-rw-r--r--Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-stderr.txt (renamed from Tests/RunCMake/CTestCommandLine/TestOutputTruncation-stderr.txt)0
-rw-r--r--Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-check.cmake1
-rw-r--r--Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-stderr.txt1
-rw-r--r--Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-check.cmake1
-rw-r--r--Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-stderr.txt1
-rw-r--r--Tests/RunCMake/ctest_test/RunCMakeTest.cmake19
-rw-r--r--Tests/RunCMake/ctest_test/TestOutputTruncation_head-check.cmake1
-rw-r--r--Tests/RunCMake/ctest_test/TestOutputTruncation_middle-check.cmake1
-rw-r--r--Tests/RunCMake/ctest_test/TestOutputTruncation_tail-check.cmake1
11 files changed, 18 insertions, 11 deletions
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 8ac174759b..2ac1f360db 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -284,7 +284,7 @@ function(run_TestOutputTruncation mode expected)
file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" "
add_test(Truncation_${mode} \"${CMAKE_COMMAND}\" -E echo 123456789)
")
- run_cmake_command(TestOutputTruncation
+ run_cmake_command(TestOutputTruncation_${mode}
${CMAKE_CTEST_COMMAND} -M Experimental -T Test
--no-compress-output
--test-output-size-passed 5
diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-check.cmake b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-check.cmake
new file mode 100644
index 0000000000..6065c30f62
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-check.cmake
@@ -0,0 +1 @@
+include(${RunCMake_SOURCE_DIR}/TestOutputTruncation-check.cmake)
diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation-stderr.txt b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-stderr.txt
index 30b46ce496..30b46ce496 100644
--- a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation-stderr.txt
+++ b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-stderr.txt
diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-check.cmake b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-check.cmake
new file mode 100644
index 0000000000..6065c30f62
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-check.cmake
@@ -0,0 +1 @@
+include(${RunCMake_SOURCE_DIR}/TestOutputTruncation-check.cmake)
diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-stderr.txt b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-stderr.txt
new file mode 100644
index 0000000000..30b46ce496
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-stderr.txt
@@ -0,0 +1 @@
+^Cannot find file: .*/Tests/RunCMake/CTestCommandLine/TestOutputTruncation.*/DartConfiguration.tcl
diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-check.cmake b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-check.cmake
new file mode 100644
index 0000000000..6065c30f62
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-check.cmake
@@ -0,0 +1 @@
+include(${RunCMake_SOURCE_DIR}/TestOutputTruncation-check.cmake)
diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-stderr.txt b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-stderr.txt
new file mode 100644
index 0000000000..30b46ce496
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-stderr.txt
@@ -0,0 +1 @@
+^Cannot find file: .*/Tests/RunCMake/CTestCommandLine/TestOutputTruncation.*/DartConfiguration.tcl
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index b41c2711d1..1aa635946c 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -84,18 +84,17 @@ run_TestOutputSize()
function(run_TestOutputTruncation mode expected)
set(CASE_CTEST_TEST_ARGS EXCLUDE RunCMakeVersion)
set(TRUNCATED_OUTPUT ${expected}) # used in TestOutputTruncation-check.cmake
- set(CASE_TEST_PREFIX_CODE [[
-set( CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION${mode})
- ]])
- set(CASE_CMAKELISTS_SUFFIX_CODE [[
-add_test(NAME Truncation_${mode} COMMAND ${CMAKE_COMMAND} -E echo 123456789)
- ]])
+ string(CONCAT CASE_TEST_PREFIX_CODE "
+set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 5)
+set(CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION ${mode})" )
+ set(CASE_CMAKELISTS_SUFFIX_CODE "
+add_test(NAME Truncation_${mode} COMMAND \${CMAKE_COMMAND} -E echo 123456789)")
- run_ctest(TestOutputTruncation)
+ run_ctest(TestOutputTruncation_${mode})
endfunction()
-run_TestOutputTruncation("head" "...6789")
-run_TestOutputTruncation("middle" "12....*...89")
-run_TestOutputTruncation("tail" "12345...")
+run_TestOutputTruncation("head" "\\.\\.\\.6789")
+run_TestOutputTruncation("middle" "12\\.\\.\\..*\\.\\.\\.89")
+run_TestOutputTruncation("tail" "12345\\.\\.\\.")
run_ctest_test(TestRepeatBad1 REPEAT UNKNOWN:3)
run_ctest_test(TestRepeatBad2 REPEAT UNTIL_FAIL:-1)
diff --git a/Tests/RunCMake/ctest_test/TestOutputTruncation_head-check.cmake b/Tests/RunCMake/ctest_test/TestOutputTruncation_head-check.cmake
new file mode 100644
index 0000000000..6065c30f62
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestOutputTruncation_head-check.cmake
@@ -0,0 +1 @@
+include(${RunCMake_SOURCE_DIR}/TestOutputTruncation-check.cmake)
diff --git a/Tests/RunCMake/ctest_test/TestOutputTruncation_middle-check.cmake b/Tests/RunCMake/ctest_test/TestOutputTruncation_middle-check.cmake
new file mode 100644
index 0000000000..6065c30f62
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestOutputTruncation_middle-check.cmake
@@ -0,0 +1 @@
+include(${RunCMake_SOURCE_DIR}/TestOutputTruncation-check.cmake)
diff --git a/Tests/RunCMake/ctest_test/TestOutputTruncation_tail-check.cmake b/Tests/RunCMake/ctest_test/TestOutputTruncation_tail-check.cmake
new file mode 100644
index 0000000000..6065c30f62
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestOutputTruncation_tail-check.cmake
@@ -0,0 +1 @@
+include(${RunCMake_SOURCE_DIR}/TestOutputTruncation-check.cmake)