44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
|
From dd779a4bc2f1b845a03b00885cd33ed2cc8adac3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Brad King <brad.king@kitware.com>
|
||
|
|
Date: Fri, 29 Sep 2023 08:54:51 -0400
|
||
|
|
Subject: [PATCH 3/6] Tests: Clarify RunCMake.CTestTimeout case name
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
|
||
|
|
---
|
||
|
|
...erridesScript-stdout.txt => PropertyOverridesVar-stdout.txt} | 2 +-
|
||
|
|
Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
rename Tests/RunCMake/CTestTimeout/{PropertyOverridesScript-stdout.txt => PropertyOverridesVar-stdout.txt} (72%)
|
||
|
|
|
||
|
|
diff --git a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt b/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt
|
||
|
|
similarity index 72%
|
||
|
|
rename from Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt
|
||
|
|
rename to Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt
|
||
|
|
index 6e46485759..aeeb3c9c39 100644
|
||
|
|
--- a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt
|
||
|
|
+++ b/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
Test project [^
|
||
|
|
-]*/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-build
|
||
|
|
+]*/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-build
|
||
|
|
Start 1: TestTimeout
|
||
|
|
1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec
|
||
|
|
+
|
||
|
|
diff --git a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake
|
||
|
|
index 2f9eda121d..e9ecc5f20d 100644
|
||
|
|
--- a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake
|
||
|
|
+++ b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake
|
||
|
|
@@ -92,5 +92,5 @@ block()
|
||
|
|
set(TIMEOUT 4)
|
||
|
|
set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)")
|
||
|
|
set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT 10)\n")
|
||
|
|
- run_ctest_timeout(PropertyOverridesScript)
|
||
|
|
+ run_ctest_timeout(PropertyOverridesVar)
|
||
|
|
endblock()
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|