From be7824c3690df5b6f7a82f198f32f78cc4176709 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 17 Apr 2009 14:44:01 -0400 Subject: [PATCH] ENH: make sure CTEST_CURL_OPTIONS work from script mode --- Modules/DartConfiguration.tcl.in | 3 +++ Source/CTest/cmCTestSubmitCommand.cxx | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index b6838dca5..2cd8437ba 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 7dfa4619f..2b317a4a8 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/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,