From 7063ae5b9943f8842607fce8462b9c071875f5c3 Mon Sep 17 00:00:00 2001
From: Nils Gladitz <gladitz@scivis.de>
Date: Sun, 23 Sep 2012 19:55:48 +0200
Subject: [PATCH] ctest without interactive svn

---
 Source/CTest/cmCTestSVN.cxx           |  102 +++++++++++++++++++++++----------
 Source/CTest/cmCTestSVN.h             |    3 +
 Source/CTest/cmCTestUpdateCommand.cxx |    2 +
 3 files changed, 77 insertions(+), 30 deletions(-)

diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx
index 49cea2e..6bf17c4 100644
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@@ -38,11 +38,13 @@ cmCTestSVN::~cmCTestSVN()
 //----------------------------------------------------------------------------
 void cmCTestSVN::CleanupImpl()
 {
-  const char* svn = this->CommandLineTool.c_str();
-  const char* svn_cleanup[] = {svn, "cleanup", 0};
+  std::vector<const char*> parameters;
+  parameters.push_back("cleanup");
+
   OutputLogger out(this->Log, "cleanup-out> ");
   OutputLogger err(this->Log, "cleanup-err> ");
-  this->RunChild(svn_cleanup, &out, &err);
+
+  RunSVNCommand(parameters, &out, &err);
 }
 
 //----------------------------------------------------------------------------
@@ -106,12 +108,16 @@ static bool cmCTestSVNPathStarts(std::string const& p1, std::string const& p2)
 std::string cmCTestSVN::LoadInfo(SVNInfo& svninfo)
 {
   // Run "svn info" to get the repository info from the work tree.
-  const char* svn = this->CommandLineTool.c_str();
-  const char* svn_info[] = {svn, "info", svninfo.LocalPath.c_str(), 0};
+  std::vector<const char*> parameters;
+  parameters.push_back("info");
+  parameters.push_back(svninfo.LocalPath.c_str());
+
   std::string rev;
   InfoParser out(this, "info-out> ", rev, svninfo);
   OutputLogger err(this->Log, "info-err> ");
-  this->RunChild(svn_info, &out, &err);
+
+  RunSVNCommand(parameters, &out, &err);
+
   return rev;
 }
 
@@ -280,24 +286,56 @@ bool cmCTestSVN::UpdateImpl()
 
   // Specify the start time for nightly testing.
   if(this->CTest->GetTestModel() == cmCTest::NIGHTLY)
-    {
+  {
     args.push_back("-r{" + this->GetNightlyTime() + " +0000}");
-    }
+  }
 
-  std::vector<char const*> svn_update;
-  svn_update.push_back(this->CommandLineTool.c_str());
-  svn_update.push_back("update");
-  svn_update.push_back("--non-interactive");
+  std::vector<char const*> parameters;
+  parameters.push_back("update");
   for(std::vector<cmStdString>::const_iterator ai = args.begin();
-      ai != args.end(); ++ai)
-    {
-    svn_update.push_back(ai->c_str());
-    }
-  svn_update.push_back(0);
+    ai != args.end(); ++ai)
+  {
+    parameters.push_back(ai->c_str());
+  }
 
   UpdateParser out(this, "up-out> ");
   OutputLogger err(this->Log, "up-err> ");
-  return this->RunUpdateCommand(&svn_update[0], &out, &err);
+  return RunSVNCommand(parameters, &out, &err);
+}
+
+//----------------------------------------------------------------------------
+bool cmCTestSVN::RunSVNCommand(std::vector<char const*> const& parameters,
+    OutputParser* out, OutputParser* err)
+{
+  if(parameters.empty()) return false;
+
+  std::vector<char const*> args;
+  args.push_back(this->CommandLineTool.c_str());
+
+  args.insert(args.end(), parameters.begin(), parameters.end());
+
+  args.push_back("--non-interactive");
+
+  std::string userOptions =
+    this->CTest->GetCTestConfiguration("SVNOptions");
+
+  std::vector<cmStdString> parsedUserOptions =
+    cmSystemTools::ParseArguments(userOptions.c_str());
+  for(std::size_t i = 0; i < parsedUserOptions.size(); ++i)
+  {
+    args.push_back(parsedUserOptions[i].c_str());
+  }
+
+  args.push_back(0);
+
+  if(strcmp(parameters[0], "update") == 0)
+  {
+    return RunUpdateCommand(&args[0], out, err);
+  }
+  else
+  {
+    return RunChild(&args[0], out, err);
+  }
 }
 
 //----------------------------------------------------------------------------
@@ -417,14 +455,16 @@ void cmCTestSVN::LoadRevisions(SVNInfo &svninfo)
     }
 
   // Run "svn log" to get all global revisions of interest.
-  const char* svn = this->CommandLineTool.c_str();
-  const char* svn_log[] = {svn, "log", "--xml", "-v", revs.c_str(),
-                           svninfo.LocalPath.c_str(), 0};
-  {
+  std::vector<const char*> parameters;
+  parameters.push_back("log");
+  parameters.push_back("--xml");
+  parameters.push_back("-v");
+  parameters.push_back(revs.c_str());
+  parameters.push_back(svninfo.LocalPath.c_str());
+
   LogParser out(this, "log-out> ", svninfo);
   OutputLogger err(this->Log, "log-err> ");
-  this->RunChild(svn_log, &out, &err);
-  }
+  RunSVNCommand(parameters, &out, &err);
 }
 
 //----------------------------------------------------------------------------
@@ -492,11 +532,12 @@ private:
 void cmCTestSVN::LoadModifications()
 {
   // Run "svn status" which reports local modifications.
-  const char* svn = this->CommandLineTool.c_str();
-  const char* svn_status[] = {svn, "status", "--non-interactive", 0};
+  std::vector<const char*> parameters;
+  parameters.push_back("status");
+
   StatusParser out(this, "status-out> ");
   OutputLogger err(this->Log, "status-err> ");
-  this->RunChild(svn_status, &out, &err);
+  RunSVNCommand(parameters, &out, &err);
 }
 
 //----------------------------------------------------------------------------
@@ -550,11 +591,12 @@ private:
 void cmCTestSVN::LoadExternals()
 {
   // Run "svn status" to get the list of external repositories
-  const char* svn = this->CommandLineTool.c_str();
-  const char* svn_status[] = {svn, "status", 0};
+  std::vector<const char*> parameters;
+  parameters.push_back("status");
+
   ExternalParser out(this, "external-out> ");
   OutputLogger err(this->Log, "external-err> ");
-  this->RunChild(svn_status, &out, &err);
+  RunSVNCommand(parameters, &out, &err);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index 56265d0..73d676e 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -33,6 +33,9 @@ private:
   virtual void NoteNewRevision();
   virtual bool UpdateImpl();
 
+  bool RunSVNCommand(std::vector<char const*> const& parameters,
+    OutputParser* out, OutputParser* err);
+
   // Information about an SVN repository (root repository or external)
   struct SVNInfo {
 
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx
index 8414349..2ca9f6c 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -44,6 +44,8 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler()
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
     "SVNUpdateOptions", "CTEST_SVN_UPDATE_OPTIONS");
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
+    "SVNOptions", "CTEST_SVN_OPTIONS");
+  this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
     "BZRCommand", "CTEST_BZR_COMMAND");
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
     "BZRUpdateOptions", "CTEST_BZR_UPDATE_OPTIONS");
-- 
1.7.9.msysgit.0