diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-08 21:03:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-08 21:03:48 (GMT) |
| commit | 8673264e25b4abfb3b328131d983e7668a8c5e1a (patch) | |
| tree | 6b602fcf79d794a380c7e5744abaad9876364f83 | |
| parent | 5c3512333c6afb9496a3fde0bf146fb1fa570f27 (diff) | |
| download | CMake-8673264e25b4abfb3b328131d983e7668a8c5e1a.zip CMake-8673264e25b4abfb3b328131d983e7668a8c5e1a.tar.gz CMake-8673264e25b4abfb3b328131d983e7668a8c5e1a.tar.bz2 | |
Tests: Make ctest tests-from-file expected output more precise
7 files changed, 13 insertions, 3 deletions
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index 715a5fa..8c3065e 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -209,7 +209,7 @@ run_SkipRegexFoundTest() function(run_TestsFromFileTest case) - set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestsFromFile) + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestsFromFile-${case}) set(RunCMake_TEST_NO_CLEAN 1) file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-missing-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-missing-stdout.txt index 1e4e805..2448284 100644 --- a/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-missing-stdout.txt +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-missing-stdout.txt @@ -1,2 +1,2 @@ Test project [^ -]*/Tests/RunCMake/CTestCommandLine/TestsFromFile$ +]*/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-missing$ diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt index 96d8c3b..6db9b50 100644 --- a/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt @@ -1,3 +1,5 @@ +Test project [^ +]*/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude +Start 2: Test2 1/2 Test #2: Test2 ............................ Passed +[0-9.]+ sec +Start 3: Test11 diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-missing-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-missing-stdout.txt index 1e4e805..1f87a44 100644 --- a/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-missing-stdout.txt +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-missing-stdout.txt @@ -1,2 +1,2 @@ Test project [^ -]*/Tests/RunCMake/CTestCommandLine/TestsFromFile$ +]*/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-missing$ diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt index 653d56c..d07400d 100644 --- a/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt @@ -1,3 +1,5 @@ +Test project [^ +]*/Tests/RunCMake/CTestCommandLine/TestsFromFile-include +Start 1: Test1 1/1 Test #1: Test1 ............................ Passed +[0-9.]+ sec + diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt index 29c2b7f..f401861 100644 --- a/Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt +++ b/Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt @@ -1,3 +1,7 @@ +Test project [^ +]*/Tests/RunCMake/ctest_test/TestsFromFile-exclude-build + +Start 1: RunCMakeVersion +1/3 Test #1: RunCMakeVersion .................. Passed +[0-9.]+ sec +Start 3: Test2 2/3 Test #3: Test2 ............................ Passed +[0-9.]+ sec +Start 4: Test11 diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt index e3ca719..8e7093b 100644 --- a/Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt +++ b/Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt @@ -1,3 +1,5 @@ +Test project [^ +]*/Tests/RunCMake/ctest_test/TestsFromFile-include-build +Start 2: Test1 1/1 Test #2: Test1 ............................ Passed +[0-9.]+ sec + |