ENH: Several cleanups and make sure things get propagated where they should. Also, allow to load CTest custom files to the actual ctest -S script

1 files changed, 21 insertions, 1 deletions

diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 10d58ae..25662cb 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -44,6 +44,7 @@ bool cmCTestHandlerCommand::InitialPass(
     return false;
     }
 
+  cmCTestLog(this->CTest, DEBUG, "Initialize handler" << std::endl;);
   cmCTestGenericHandler* handler = this->InitializeHandler();
   if ( !handler )
     {
@@ -51,11 +52,31 @@ bool cmCTestHandlerCommand::InitialPass(
     return false;
     }
 
+  cmCTestLog(this->CTest, DEBUG, "Populate Custom Vectors" << std::endl;);
+  handler->PopulateCustomVectors(this->Makefile);
+
   if ( this->Values[ct_BUILD] )
     {
     this->CTest->SetCTestConfiguration("BuildDirectory",
       this->Values[ct_BUILD]);
     }
+  else
+    {
+    this->CTest->SetCTestConfiguration("BuildDirectory",
+      this->Makefile->GetDefinition("CTEST_BINARY_DIRECTORY"));
+    }
+  if ( this->Values[ct_SOURCE] )
+    {
+    cmCTestLog(this->CTest, DEBUG,
+      "Set source directory to: " << this->Values[ct_SOURCE] << std::endl);
+    this->CTest->SetCTestConfiguration("SourceDirectory",
+      this->Values[ct_SOURCE]);
+    }
+  else
+    {
+    this->CTest->SetCTestConfiguration("SourceDirectory",
+      this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY"));
+    }
   if ( this->Values[ct_SUBMIT_INDEX] )
     {
     if ( this->CTest->GetDartVersion() <= 1 )
@@ -72,7 +93,6 @@ bool cmCTestHandlerCommand::InitialPass(
       }
     }
 
-
   std::string current_dir = cmSystemTools::GetCurrentWorkingDirectory();
   cmSystemTools::ChangeDirectory(
     this->CTest->GetCTestConfiguration("BuildDirectory").c_str());