From 5115c01e1fd7cf072443b8a95512790b9dc7440b Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Sun, 6 Oct 2024 16:37:26 +0200 Subject: [PATCH] CTestCommandLine tests: Make sure to test successful run Add a DartConfiguration.tcl file in two places, so that testing the generated Text.xml file does not depend on output in stderr. --- Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 6 ++++++ Tests/RunCMake/CTestCommandLine/TestOutputSize-stderr.txt | 2 -- .../CTestCommandLine/TestOutputTruncation_head-stderr.txt | 1 - .../CTestCommandLine/TestOutputTruncation_middle-stderr.txt | 1 - .../CTestCommandLine/TestOutputTruncation_tail-stderr.txt | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 Tests/RunCMake/CTestCommandLine/TestOutputSize-stderr.txt delete mode 100644 Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-stderr.txt delete mode 100644 Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-stderr.txt delete mode 100644 Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-stderr.txt diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index b2374ca5a1..e5e385e4d0 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -355,6 +355,9 @@ function(run_TestOutputSize) set(RunCMake_TEST_NO_CLEAN 1) file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") + file(WRITE "${RunCMake_TEST_BINARY_DIR}/DartConfiguration.tcl" " +BuildDirectory: ${RunCMake_TEST_BINARY_DIR} +") file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" " add_test(PassingTest \"${CMAKE_COMMAND}\" -E echo PassingTestOutput) add_test(FailingTest \"${CMAKE_COMMAND}\" -E no_such_command) @@ -375,6 +378,9 @@ function(run_TestOutputTruncation mode expected) set(TRUNCATED_OUTPUT ${expected}) # used in TestOutputTruncation-check.cmake file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") + file(WRITE "${RunCMake_TEST_BINARY_DIR}/DartConfiguration.tcl" " +BuildDirectory: ${RunCMake_TEST_BINARY_DIR} +") file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" " add_test(Truncation_${mode} \"${CMAKE_COMMAND}\" -E echo 123456789) ") diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputSize-stderr.txt b/Tests/RunCMake/CTestCommandLine/TestOutputSize-stderr.txt deleted file mode 100644 index 19310b8ed0..0000000000 --- a/Tests/RunCMake/CTestCommandLine/TestOutputSize-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -^Cannot find file: .*/Tests/RunCMake/CTestCommandLine/TestOutputSize/DartConfiguration.tcl -Errors while running CTest diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-stderr.txt b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-stderr.txt deleted file mode 100644 index 30b46ce496..0000000000 --- a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_head-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^Cannot find file: .*/Tests/RunCMake/CTestCommandLine/TestOutputTruncation.*/DartConfiguration.tcl diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-stderr.txt b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-stderr.txt deleted file mode 100644 index 30b46ce496..0000000000 --- a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_middle-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^Cannot find file: .*/Tests/RunCMake/CTestCommandLine/TestOutputTruncation.*/DartConfiguration.tcl diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-stderr.txt b/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-stderr.txt deleted file mode 100644 index 30b46ce496..0000000000 --- a/Tests/RunCMake/CTestCommandLine/TestOutputTruncation_tail-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^Cannot find file: .*/Tests/RunCMake/CTestCommandLine/TestOutputTruncation.*/DartConfiguration.tcl