[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7098-gc4c87f2
Brad King
brad.king at kitware.com
Tue Jan 14 16:28:16 EST 2014
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 c4c87f28290aad67d75ba540bb962bc067073f5d (commit)
via 235a1b55301a3c1709ef22460ad0f9103c777677 (commit)
from 69bf3d91a486e5042522240b9806854ab442dc57 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4c87f28290aad67d75ba540bb962bc067073f5d
commit c4c87f28290aad67d75ba540bb962bc067073f5d
Merge: 69bf3d9 235a1b5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 14 16:28:15 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 14 16:28:15 2014 -0500
Merge topic 'skip-return-code' into next
235a1b55 Revert "allow to mark a test as "Not Run" with a specific return code (#8466)"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=235a1b55301a3c1709ef22460ad0f9103c777677
commit 235a1b55301a3c1709ef22460ad0f9103c777677
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 14 16:28:20 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 14 16:28:20 2014 -0500
Revert "allow to mark a test as "Not Run" with a specific return code (#8466)"
This reverts commit 299f3260b6d82f01755be25c14b1345c64e4ee80.
The commit is missing a file.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index c0ec0fe..d569e31 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -247,7 +247,6 @@ Properties on Tests
/prop_test/REQUIRED_FILES
/prop_test/RESOURCE_LOCK
/prop_test/RUN_SERIAL
- /prop_test/SKIP_RETURN_CODE
/prop_test/TIMEOUT
/prop_test/WILL_FAIL
/prop_test/WORKING_DIRECTORY
diff --git a/Help/prop_test/SKIP_RETURN_CODE.rst b/Help/prop_test/SKIP_RETURN_CODE.rst
deleted file mode 100644
index c61273c..0000000
--- a/Help/prop_test/SKIP_RETURN_CODE.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-SKIP_RETURN_CODE
-----------------
-
-Return code to mark a test as skipped.
-
-Sometimes only a test itself can determine if all requirements for the
-test are met. If such a situation should not be considered a hard failure
-a return code of the process can be specified that will mark the test as
-"Not Run" if it is encountered.
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index cdf90b9..0e2fa41 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -206,13 +206,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
bool success =
!forceFail && (retVal == 0 ||
this->TestProperties->RequiredRegularExpressions.size());
- if(this->TestProperties->SkipReturnCode >= 0
- && this->TestProperties->SkipReturnCode == retVal)
- {
- this->TestResult.Status = cmCTestTestHandler::NOT_RUN;
- cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Skipped ");
- }
- else if((success && !this->TestProperties->WillFail)
+ if((success && !this->TestProperties->WillFail)
|| (!success && this->TestProperties->WillFail))
{
this->TestResult.Status = cmCTestTestHandler::COMPLETED;
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 3a04b33..26f8014 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -2229,14 +2229,6 @@ bool cmCTestTestHandler::SetTestsProperties(
rtit->Processors = 1;
}
}
- if ( key == "SKIP_RETURN_CODE" )
- {
- rtit->SkipReturnCode = atoi(val.c_str());
- if(rtit->SkipReturnCode < 0 || rtit->SkipReturnCode > 255)
- {
- rtit->SkipReturnCode = -1;
- }
- }
if ( key == "DEPENDS" )
{
std::vector<std::string> lval;
@@ -2372,7 +2364,6 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
test.ExplicitTimeout = false;
test.Cost = 0;
test.Processors = 1;
- test.SkipReturnCode = -1;
test.PreviousRuns = 0;
if (this->UseIncludeRegExpFlag &&
!this->IncludeTestsRegularExpression.find(testname.c_str()))
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index 63f9c93..6dda300 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -109,8 +109,6 @@ public:
int Index;
//Requested number of process slots
int Processors;
- // return code of test which will mark test as "not run"
- int SkipReturnCode;
std::vector<std::string> Environment;
std::vector<std::string> Labels;
std::set<std::string> LockedResources;
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8b2db1b..7969078 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2230,17 +2230,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log"
)
- configure_file(
- "${CMake_SOURCE_DIR}/Tests/CTestTestSkipReturnCode/test.cmake.in"
- "${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/test.cmake"
- @ONLY ESCAPE_QUOTES)
- add_test(CTestTestSkipReturnCode ${CMAKE_CTEST_COMMAND}
- -S "${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/test.cmake" -V
- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/testOutput.log"
- )
- set_tests_properties(CTestTestSkipReturnCode PROPERTIES
- PASS_REGULAR_EXPRESSION "CMakeV1 \\.* +Passed.*CMakeV2 \\.+\\*+Skipped")
-
ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4
--output-on-failure -C "\${CTestTest_CONFIG}")
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 1 -
Help/prop_test/SKIP_RETURN_CODE.rst | 9 ---------
Source/CTest/cmCTestRunTest.cxx | 8 +-------
Source/CTest/cmCTestTestHandler.cxx | 9 ---------
Source/CTest/cmCTestTestHandler.h | 2 --
Tests/CMakeLists.txt | 11 -----------
6 files changed, 1 insertion(+), 39 deletions(-)
delete mode 100644 Help/prop_test/SKIP_RETURN_CODE.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list