瀏覽代碼

ENH: make sure CTEST_CURL_OPTIONS work from script mode

Bill Hoffman 16 年之前
父節點
當前提交
be7824c369
共有 2 個文件被更改,包括 5 次插入0 次删除
  1. 3 0
      Modules/DartConfiguration.tcl.in
  2. 2 0
      Source/CTest/cmCTestSubmitCommand.cxx

+ 3 - 0
Modules/DartConfiguration.tcl.in

@@ -63,3 +63,6 @@ TimeOut: @DART_TESTING_TIMEOUT@
 
 UseLaunchers: @CTEST_USE_LAUNCHERS@
 CurlOptions: @CTEST_CURL_OPTIONS@
+# warning, if you add new options here that have to do with submit,
+# you have to update cmCTestSubmitCommand.cxx
+

+ 2 - 0
Source/CTest/cmCTestSubmitCommand.cxx

@@ -91,6 +91,8 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
     this->CTest->SetCTestConfiguration("TriggerSite",  ctestTriggerSite);
     }
 
+  this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
+    "CurlOptions", "CTEST_CURL_OPTIONS");
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
     "DropSiteUser", "CTEST_DROP_SITE_USER");
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,