[Cmake-commits] CMake branch, master, updated. v3.10.0-593-g0f57e15
Kitware Robot
kwrobot at kitware.com
Mon Dec 11 08:35:09 EST 2017
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, master has been updated
via 0f57e1515770d146de3294770aa63b8d727eabe6 (commit)
via 1efb6e566fd2d35fc744559efad095dbef8cf0c6 (commit)
via f984296ba8c663eba747454338d8839cdeb96421 (commit)
via 9dee52bacad3a5b3794b0101b7b16d6bc9b0553a (commit)
via 3b1bb703a2f75f26fd453e50f848b5dbd64bc169 (commit)
from 14fe6d431b12139ea2aeb5bcc09efd0f964597aa (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=0f57e1515770d146de3294770aa63b8d727eabe6
commit 0f57e1515770d146de3294770aa63b8d727eabe6
Merge: 1efb6e5 f984296
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 11 13:33:45 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Dec 11 08:33:58 2017 -0500
Merge topic 'ctest-remove-unfinished-batch-mode'
f984296b CTest: Remove unfinished batch test mode
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1577
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1efb6e566fd2d35fc744559efad095dbef8cf0c6
commit 1efb6e566fd2d35fc744559efad095dbef8cf0c6
Merge: 14fe6d4 9dee52b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 11 13:33:19 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Dec 11 08:33:25 2017 -0500
Merge topic 'update-kwsys'
9dee52ba Merge branch 'upstream-KWSys' into update-kwsys
3b1bb703 KWSys 2017-12-08 (2d27b1d0)
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1576
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f984296ba8c663eba747454338d8839cdeb96421
commit f984296ba8c663eba747454338d8839cdeb96421
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 8 11:22:50 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 8 11:23:33 2017 -0500
CTest: Remove unfinished batch test mode
This was partially implemented by commit v2.8.0~154 (Added some ctest
batch capabilities, 2009-09-10) but never finished.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 5611e55..7031d5a 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -802,7 +802,6 @@ include_directories(
#
set(CTEST_SRCS cmCTest.cxx
CTest/cmProcess.cxx
- CTest/cmCTestBatchTestHandler.cxx
CTest/cmCTestBuildAndTestHandler.cxx
CTest/cmCTestBuildCommand.cxx
CTest/cmCTestBuildHandler.cxx
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx
deleted file mode 100644
index 2eed8be..0000000
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
- file Copyright.txt or https://cmake.org/licensing for details. */
-#include "cmCTestBatchTestHandler.h"
-
-#include "cmCTest.h"
-#include "cmCTestMultiProcessHandler.h"
-#include "cmCTestTestHandler.h"
-#include "cmProcess.h"
-#include "cmSystemTools.h"
-
-#include <map>
-#include <utility>
-#include <vector>
-
-cmCTestBatchTestHandler::~cmCTestBatchTestHandler()
-{
-}
-
-void cmCTestBatchTestHandler::RunTests()
-{
- this->WriteBatchScript();
- this->SubmitBatchScript();
-}
-
-void cmCTestBatchTestHandler::WriteBatchScript()
-{
- this->Script = this->CTest->GetBinaryDir() + "/Testing/CTestBatch.txt";
- cmsys::ofstream fout;
- fout.open(this->Script.c_str());
- fout << "#!/bin/sh\n";
-
- for (auto const& t : this->Tests) {
- this->WriteSrunArgs(t.first, fout);
- this->WriteTestCommand(t.first, fout);
- fout << "\n";
- }
- fout.flush();
- fout.close();
-}
-
-void cmCTestBatchTestHandler::WriteSrunArgs(int test, std::ostream& fout)
-{
- cmCTestTestHandler::cmCTestTestProperties* properties =
- this->Properties[test];
-
- fout << "srun ";
- // fout << "--jobid=" << test << " ";
- fout << "-J=" << properties->Name << " ";
-
- // Write dependency information
- /*if(!this->Tests[test].empty())
- {
- fout << "-P=afterany";
- for(TestSet::iterator i = this->Tests[test].begin();
- i != this->Tests[test].end(); ++i)
- {
- fout << ":" << *i;
- }
- fout << " ";
- }*/
- if (properties->RunSerial) {
- fout << "--exclusive ";
- }
- if (properties->Processors > 1) {
- fout << "-n" << properties->Processors << " ";
- }
-}
-
-void cmCTestBatchTestHandler::WriteTestCommand(int test, std::ostream& fout)
-{
- std::vector<std::string> args = this->Properties[test]->Args;
- std::vector<std::string> processArgs;
- std::string command;
-
- command = this->TestHandler->FindTheExecutable(args[1].c_str());
- command = cmSystemTools::ConvertToOutputPath(command.c_str());
-
- // Prepends memcheck args to our command string if this is a memcheck
- this->TestHandler->GenerateTestCommand(processArgs, test);
- processArgs.push_back(command);
-
- for (std::string const& arg : processArgs) {
- fout << arg << " ";
- }
-
- std::vector<std::string>::iterator i = args.begin();
- ++i; // the test name
- ++i; // the executable (command)
- if (args.size() > 2) {
- fout << "'";
- }
- while (i != args.end()) {
- fout << "\"" << *i << "\""; // args to the test executable
- ++i;
-
- if (i == args.end() && args.size() > 2) {
- fout << "'";
- }
- fout << " ";
- }
- // TODO ZACH build TestResult.FullCommandLine
- // this->TestResult.FullCommandLine = this->TestCommand;
-}
-
-void cmCTestBatchTestHandler::SubmitBatchScript()
-{
- cmProcess sbatch;
- std::vector<std::string> args;
- args.push_back(this->Script);
- args.push_back("-o");
- args.push_back(this->CTest->GetBinaryDir() + "/Testing/CTestBatch.txt");
-
- sbatch.SetCommand("sbatch");
- sbatch.SetCommandArguments(args);
- /*if(sbatch.StartProcess())
- {
- //success condition
- }
- else
- {
- //fail condition
- }*/
-}
diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h
deleted file mode 100644
index 42f87bd..0000000
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
- file Copyright.txt or https://cmake.org/licensing for details. */
-#ifndef cmCTestBatchTestHandler_h
-#define cmCTestBatchTestHandler_h
-
-#include "cmConfigure.h" // IWYU pragma: keep
-
-#include "cmCTestMultiProcessHandler.h"
-#include "cmsys/FStream.hxx"
-#include <string>
-
-/** \class cmCTestBatchTestHandler
- * \brief run parallel ctest
- *
- * cmCTestBatchTestHandler
- */
-class cmCTestBatchTestHandler : public cmCTestMultiProcessHandler
-{
-public:
- ~cmCTestBatchTestHandler() override;
- void RunTests() override;
-
-protected:
- void WriteBatchScript();
- void WriteSrunArgs(int test, std::ostream& fout);
- void WriteTestCommand(int test, std::ostream& fout);
-
- void SubmitBatchScript();
-
- std::string Script;
-};
-
-#endif
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 1e15cc5..9819899 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -19,7 +19,6 @@
#include "cmAlgorithms.h"
#include "cmCTest.h"
-#include "cmCTestBatchTestHandler.h"
#include "cmCTestMultiProcessHandler.h"
#include "cmCommand.h"
#include "cmGeneratedFileStream.h"
@@ -1210,9 +1209,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed,
this->StartTestTime = std::chrono::system_clock::now();
auto elapsed_time_start = std::chrono::steady_clock::now();
- cmCTestMultiProcessHandler* parallel = this->CTest->GetBatchJobs()
- ? new cmCTestBatchTestHandler
- : new cmCTestMultiProcessHandler;
+ cmCTestMultiProcessHandler* parallel = new cmCTestMultiProcessHandler;
parallel->SetCTest(this->CTest);
parallel->SetParallelLevel(this->CTest->GetParallelLevel());
parallel->SetTestHandler(this);
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index 19b345e..4fb067a 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -29,7 +29,6 @@ class cmCTestTestHandler : public cmCTestGenericHandler
{
friend class cmCTestRunTest;
friend class cmCTestMultiProcessHandler;
- friend class cmCTestBatchTestHandler;
public:
typedef cmCTestGenericHandler Superclass;
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index a4ca301..f5ddc23 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -267,7 +267,6 @@ cmCTest::cmCTest()
this->TestLoad = 0;
this->SubmitIndex = 0;
this->Failover = false;
- this->BatchJobs = false;
this->ForceNewCTestProcess = false;
this->TomorrowTag = false;
this->Verbose = false;
@@ -1819,9 +1818,6 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
if (this->CheckArgument(arg, "-V", "--verbose")) {
this->Verbose = true;
}
- if (this->CheckArgument(arg, "-B")) {
- this->BatchJobs = true;
- }
if (this->CheckArgument(arg, "-VV", "--extra-verbose")) {
this->ExtraVerbose = true;
this->Verbose = true;
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index ba94866..44a6350 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -427,9 +427,6 @@ public:
void SetFailover(bool failover) { this->Failover = failover; }
bool GetFailover() { return this->Failover; }
- void SetBatchJobs(bool batch = true) { this->BatchJobs = batch; }
- bool GetBatchJobs() { return this->BatchJobs; }
-
bool GetVerbose() { return this->Verbose; }
bool GetExtraVerbose() { return this->ExtraVerbose; }
@@ -475,7 +472,6 @@ private:
bool UseHTTP10;
bool PrintLabels;
bool Failover;
- bool BatchJobs;
bool ForceNewCTestProcess;
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9507880..1d13f1c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3069,8 +3069,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
add_test(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N)
- add_test(CTestBatchTest ${CMAKE_CTEST_COMMAND} -B)
-
configure_file(
"${CMake_SOURCE_DIR}/Tests/CTestTestFdSetSize/test.cmake.in"
"${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/test.cmake"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9dee52bacad3a5b3794b0101b7b16d6bc9b0553a
commit 9dee52bacad3a5b3794b0101b7b16d6bc9b0553a
Merge: d25bcab 3b1bb70
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 8 10:08:39 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 8 10:08:39 2017 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-12-08 (2d27b1d0)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b1bb703a2f75f26fd453e50f848b5dbd64bc169
commit 3b1bb703a2f75f26fd453e50f848b5dbd64bc169
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Fri Dec 8 10:08:10 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 8 10:08:38 2017 -0500
KWSys 2017-12-08 (2d27b1d0)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 2d27b1d075d93860ee63564f635fd1710aa61208 (master).
Upstream Shortlog
-----------------
Brad King (1):
9995f700 hashtable: Drop when building inside CMake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64b6484..351e38d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -705,9 +705,13 @@ ENDIF()
# selected components. Initialize with required components.
SET(KWSYS_CLASSES)
SET(KWSYS_H_FILES Configure SharedForward)
-SET(KWSYS_HXX_FILES Configure String
- hashtable hash_fun hash_map hash_set
- )
+SET(KWSYS_HXX_FILES Configure String)
+
+IF(NOT CMake_SOURCE_DIR)
+ SET(KWSYS_HXX_FILES ${KWSYS_HXX_FILES}
+ hashtable hash_fun hash_map hash_set
+ )
+ENDIF()
# Add selected C++ classes.
SET(cppclasses
@@ -1027,7 +1031,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
ENDFOREACH()
# C++ tests
- IF(NOT WATCOM)
+ IF(NOT WATCOM AND NOT CMake_SOURCE_DIR)
SET(KWSYS_CXX_TESTS
testHashSTL
)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 1 -
Source/CTest/cmCTestBatchTestHandler.cxx | 123 ------------------------------
Source/CTest/cmCTestBatchTestHandler.h | 33 --------
Source/CTest/cmCTestTestHandler.cxx | 5 +-
Source/CTest/cmCTestTestHandler.h | 1 -
Source/cmCTest.cxx | 4 -
Source/cmCTest.h | 4 -
Source/kwsys/CMakeLists.txt | 12 ++-
Tests/CMakeLists.txt | 2 -
9 files changed, 9 insertions(+), 176 deletions(-)
delete mode 100644 Source/CTest/cmCTestBatchTestHandler.cxx
delete mode 100644 Source/CTest/cmCTestBatchTestHandler.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list