diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-04-17 14:44:01 -0400 |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-04-17 14:44:01 -0400 |
commit | be7824c3690df5b6f7a82f198f32f78cc4176709 (patch) | |
tree | 2becfc6f51e00da58f348535f25b57d40ce9df78 | |
parent | 3e0db72aaab91e9ece9b2e6eb01e78c63d094b61 (diff) | |
download | cmake-be7824c3690df5b6f7a82f198f32f78cc4176709.tar.gz |
ENH: make sure CTEST_CURL_OPTIONS work from script mode
-rw-r--r-- | Modules/DartConfiguration.tcl.in | 3 | ||||
-rw-r--r-- | Source/CTest/cmCTestSubmitCommand.cxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index b6838dca5d..2cd8437baf 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/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 + diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index 7dfa4619f8..2b317a4a8b 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -92,6 +92,8 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler() } this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile, + "CurlOptions", "CTEST_CURL_OPTIONS"); + this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile, "DropSiteUser", "CTEST_DROP_SITE_USER"); this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile, "DropSitePassword", "CTEST_DROP_SITE_PASSWORD"); |