[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-376-g6d0ea81
Brad King
brad.king at kitware.com
Tue Mar 8 09:55:47 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 6d0ea81a2f3a2874ad48402b9a478403163ecc56 (commit)
via b0251fae9923208f05159f5f24f8744665d7c721 (commit)
from e5720d2c0fbb37a0ebb9ab571435cd4670568a7e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d0ea81a2f3a2874ad48402b9a478403163ecc56
commit 6d0ea81a2f3a2874ad48402b9a478403163ecc56
Merge: e5720d2 b0251fa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 09:55:47 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 8 09:55:47 2016 -0500
Merge topic 'timeout_after_match' into next
b0251fae Revert "New test property: TIMEOUT_AFTER_MATCH"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0251fae9923208f05159f5f24f8744665d7c721
commit b0251fae9923208f05159f5f24f8744665d7c721
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 09:55:23 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 8 09:55:23 2016 -0500
Revert "New test property: TIMEOUT_AFTER_MATCH"
This reverts commit 2445d306211462d823bd906eddab3660b5703310.
It will be revised and restored later.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index eb489a2..a41d484 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -302,7 +302,6 @@ Properties on Tests
/prop_test/RUN_SERIAL
/prop_test/SKIP_RETURN_CODE
/prop_test/TIMEOUT
- /prop_test/TIMEOUT_AFTER_MATCH
/prop_test/WILL_FAIL
/prop_test/WORKING_DIRECTORY
diff --git a/Help/prop_test/TIMEOUT_AFTER_MATCH.rst b/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
deleted file mode 100644
index c8883e3..0000000
--- a/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-TIMEOUT_AFTER_MATCH
--------------------
-
-Change a test's timeout duration after a matching line is encountered
-in its output.
-
-Usage
-^^^^^
-
-.. code-block:: cmake
-
- add_test(mytest ...)
- set_property(TEST mytest PROPERTY TIMEOUT_AFTER_MATCH "${seconds}" "${regex}")
-
-Description
-^^^^^^^^^^^
-
-The test's timeout duration is changed to ``seconds`` after it outputs
-a line that matches ``regex``. Prior to this, the timeout duration is
-determined by the :prop_test:`TIMEOUT` property or the
-:variable:`CTEST_TEST_TIMEOUT` variable if either of these are set.
-
-:prop_test:`TIMEOUT_AFTER_MATCH` is useful for avoiding spurious
-timeouts when your test must wait for some system resource to become
-available before it can execute. Set :prop_test:`TIMEOUT` to a longer
-duration that accounts for resource acquisition and use
-:prop_test:`TIMEOUT_AFTER_MATCH` to control how long the actual test
-is allowed to run.
-
-If the required resource can be controlled by CTest you should use
-:prop_test:`RESOURCE_LOCK` instead of :prop_test:`TIMEOUT_AFTER_MATCH`.
-This property should be used when only the test itself can determine
-when its required resources are available.
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index c1984cf..d108592 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -64,27 +64,6 @@ bool cmCTestRunTest::CheckOutput()
this->GetIndex() << ": " << line << std::endl);
this->ProcessOutput += line;
this->ProcessOutput += "\n";
-
- // Check for TIMEOUT_AFTER_MATCH property.
- if (!this->TestProperties->TimeoutRegularExpressions.empty())
- {
- std::vector<std::pair<cmsys::RegularExpression,
- std::string> >::iterator regIt;
- for ( regIt = this->TestProperties->TimeoutRegularExpressions.begin();
- regIt != this->TestProperties->TimeoutRegularExpressions.end();
- ++ regIt )
- {
- if ( regIt->first.find(this->ProcessOutput.c_str()) )
- {
- cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- "Test timeout changed to " <<
- this->TestProperties->AlternateTimeout << std::endl);
- this->TestProcess->ChangeTimeout(
- this->TestProperties->AlternateTimeout);
- break;
- }
- }
- }
}
else // if(p == cmsysProcess_Pipe_Timeout)
{
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 59ed98e..b6a4819 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -2254,31 +2254,6 @@ bool cmCTestTestHandler::SetTestsProperties(
{
rtit->Directory = val;
}
- if ( key == "TIMEOUT_AFTER_MATCH" )
- {
- std::vector<std::string> propArgs;
- cmSystemTools::ExpandListArgument(val, propArgs);
- if (propArgs.size() != 2)
- {
- cmCTestLog(this->CTest, WARNING,
- "TIMEOUT_AFTER_MATCH expects two arguments, found " <<
- propArgs.size() << std::endl);
- }
- else
- {
- rtit->AlternateTimeout = atof(propArgs[0].c_str());
- std::vector<std::string> lval;
- cmSystemTools::ExpandListArgument(propArgs[1], lval);
- std::vector<std::string>::iterator crit;
- for ( crit = lval.begin(); crit != lval.end(); ++ crit )
- {
- rtit->TimeoutRegularExpressions.push_back(
- std::pair<cmsys::RegularExpression, std::string>(
- cmsys::RegularExpression(crit->c_str()),
- std::string(*crit)));
- }
- }
- }
}
}
}
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index d12c2b6..c635430 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -104,8 +104,6 @@ public:
std::string> > ErrorRegularExpressions;
std::vector<std::pair<cmsys::RegularExpression,
std::string> > RequiredRegularExpressions;
- std::vector<std::pair<cmsys::RegularExpression,
- std::string> > TimeoutRegularExpressions;
std::map<std::string, std::string> Measurements;
bool IsInBasedOnREOptions;
bool WillFail;
@@ -114,7 +112,6 @@ public:
bool RunSerial;
double Timeout;
bool ExplicitTimeout;
- double AlternateTimeout;
int Index;
//Requested number of process slots
int Processors;
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx
index 9de0077..0c25f40 100644
--- a/Source/CTest/cmProcess.cxx
+++ b/Source/CTest/cmProcess.cxx
@@ -262,11 +262,6 @@ int cmProcess::ReportStatus()
}
-void cmProcess::ChangeTimeout(double t)
-{
- this->Timeout = t;
- cmsysProcess_SetTimeout(this->Process, this->Timeout);
-}
int cmProcess::GetExitException()
{
diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h
index 8aa04d0..eddeeab 100644
--- a/Source/CTest/cmProcess.h
+++ b/Source/CTest/cmProcess.h
@@ -32,7 +32,6 @@ public:
void SetCommandArguments(std::vector<std::string> const& arg);
void SetWorkingDirectory(const char* dir) { this->WorkingDirectory = dir;}
void SetTimeout(double t) { this->Timeout = t;}
- void ChangeTimeout(double t);
// Return true if the process starts
bool StartProcess();
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f1d770b..0a388c5 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -216,7 +216,6 @@ add_RunCMake_test(alias_targets)
add_RunCMake_test(interface_library)
add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file)
-add_RunCMake_test(CTestTimeoutAfterMatch)
find_package(Qt4 QUIET)
find_package(Qt5Core QUIET)
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in b/Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in
deleted file mode 100644
index 5614d3c..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-project(TimeoutAfterMatch NONE)
-include(CTest)
-add_test(NAME SleepFor1Second COMMAND "${CMAKE_COMMAND}" -P ${CMAKE_SOURCE_DIR}/SleepFor1Second.cmake)
-set_property(TEST SleepFor1Second PROPERTY TIMEOUT 2)
-set_property(TEST SleepFor1Second PROPERTY TIMEOUT_AFTER_MATCH "${arg1}" "${arg2}")
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in b/Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in
deleted file mode 100644
index 58b11af..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "TimeoutAfterMatch at CASE_NAME@")
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg1-stderr.txt b/Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg1-stderr.txt
deleted file mode 100644
index 7766c68..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg1-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-TIMEOUT_AFTER_MATCH expects two arguments, found 1
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg2-stderr.txt b/Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg2-stderr.txt
deleted file mode 100644
index 7766c68..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-TIMEOUT_AFTER_MATCH expects two arguments, found 1
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake
deleted file mode 100644
index 237a013..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-include(RunCTest)
-
-function(run_ctest_TimeoutAfterMatch CASE_NAME)
- set(CASE_PROPERTY_ARGS "${ARGN}")
- run_ctest(${CASE_NAME})
-endfunction()
-
-run_ctest_TimeoutAfterMatch(MissingArg1 "\"-Darg2=Test started\"")
-run_ctest_TimeoutAfterMatch(MissingArg2 "\"-Darg1=2\"")
-run_ctest_TimeoutAfterMatch(ShouldTimeout "\"-Darg1=1\" \"-Darg2=Test started\"")
-run_ctest_TimeoutAfterMatch(ShouldPass "\"-Darg1=2\" \"-Darg2=Test started\"")
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/ShouldPass-stdout.txt b/Tests/RunCMake/CTestTimeoutAfterMatch/ShouldPass-stdout.txt
deleted file mode 100644
index 89aae56..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/ShouldPass-stdout.txt
+++ /dev/null
@@ -1,6 +0,0 @@
- Start 1: SleepFor1Second
-1/1 Test #1: SleepFor1Second .................. Passed +[0-9.]+ sec
-+
-100% tests passed, 0 tests failed out of 1
-+
-Total Test time \(real\) = +[0-9.]+ sec$
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/ShouldTimeout-stdout.txt b/Tests/RunCMake/CTestTimeoutAfterMatch/ShouldTimeout-stdout.txt
deleted file mode 100644
index c031eb0..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/ShouldTimeout-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 - SleepFor1Second \(Timeout\)
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/SleepFor1Second.cmake b/Tests/RunCMake/CTestTimeoutAfterMatch/SleepFor1Second.cmake
deleted file mode 100644
index f8fe22c..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/SleepFor1Second.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-execute_process(COMMAND "${CMAKE_COMMAND}" -E echo "Test started")
-execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/test.cmake.in b/Tests/RunCMake/CTestTimeoutAfterMatch/test.cmake.in
deleted file mode 100644
index d049c9f..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/test.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-
-set(CTEST_SITE "test-site")
-set(CTEST_BUILD_NAME "test-build-name")
-set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@")
-set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
-set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@")
-set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@")
-set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@")
-set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
-
-configure_file(
- "@RunCMake_SOURCE_DIR@/SleepFor1Second.cmake"
- "${CTEST_SOURCE_DIRECTORY}/SleepFor1Second.cmake"
- COPYONLY)
-
-set(options @CASE_PROPERTY_ARGS@)
-
-ctest_start(Experimental)
-ctest_configure(OPTIONS "${options}")
-ctest_test()
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 1 -
Help/prop_test/TIMEOUT_AFTER_MATCH.rst | 33 --------------------
Source/CTest/cmCTestRunTest.cxx | 21 -------------
Source/CTest/cmCTestTestHandler.cxx | 25 ---------------
Source/CTest/cmCTestTestHandler.h | 3 --
Source/CTest/cmProcess.cxx | 5 ---
Source/CTest/cmProcess.h | 1 -
Tests/RunCMake/CMakeLists.txt | 1 -
.../CTestTimeoutAfterMatch/CMakeLists.txt.in | 6 ----
.../CTestTimeoutAfterMatch/CTestConfig.cmake.in | 1 -
.../CTestTimeoutAfterMatch/MissingArg1-stderr.txt | 1 -
.../CTestTimeoutAfterMatch/MissingArg2-stderr.txt | 1 -
.../CTestTimeoutAfterMatch/RunCMakeTest.cmake | 11 -------
.../CTestTimeoutAfterMatch/ShouldPass-stdout.txt | 6 ----
.../ShouldTimeout-stdout.txt | 1 -
.../CTestTimeoutAfterMatch/SleepFor1Second.cmake | 2 --
.../RunCMake/CTestTimeoutAfterMatch/test.cmake.in | 21 -------------
17 files changed, 140 deletions(-)
delete mode 100644 Help/prop_test/TIMEOUT_AFTER_MATCH.rst
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/CMakeLists.txt.in
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg1-stderr.txt
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/MissingArg2-stderr.txt
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/RunCMakeTest.cmake
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/ShouldPass-stdout.txt
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/ShouldTimeout-stdout.txt
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/SleepFor1Second.cmake
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/test.cmake.in
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list