diff options
| -rw-r--r-- | DartConfig.cmake | 2 | ||||
| -rw-r--r-- | Source/CTest/cmCTestSubmit.cxx | 13 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/DartConfig.cmake b/DartConfig.cmake index 1b014b330e..63384936ad 100644 --- a/DartConfig.cmake +++ b/DartConfig.cmake @@ -8,7 +8,7 @@ IF(DROP_METHOD MATCHES http) SET (DROP_LOCATION "/cgi-bin/HTTPUploadDartFile.cgi") ELSE(DROP_METHOD MATCHES http) IF(DROP_METHOD MATCHES xmlrpc) - SET (DROP_SITE "http://na-mic.org:8081/Insight/") + SET (DROP_SITE "http://www.na-mic.org:8080/") SET (DROP_LOCATION "Insight") SET (COMPRESS_SUBMISSION ON) ELSE(DROP_METHOD MATCHES xmlrpc) diff --git a/Source/CTest/cmCTestSubmit.cxx b/Source/CTest/cmCTestSubmit.cxx index 601b90ac07..101058950a 100644 --- a/Source/CTest/cmCTestSubmit.cxx +++ b/Source/CTest/cmCTestSubmit.cxx @@ -558,7 +558,6 @@ bool cmCTestSubmit::SubmitUsingXMLRPC(const cmStdString& localprefix, const cmStdString& url) { xmlrpc_env env; - xmlrpc_value *result; std::string ctestVersion = cmVersion::GetCMakeVersion(); const char *state_name; @@ -576,6 +575,8 @@ bool cmCTestSubmit::SubmitUsingXMLRPC(const cmStdString& localprefix, int cnt = 32; for ( it = files.begin(); it != files.end(); ++it ) { + xmlrpc_value *result; + std::string local_file = localprefix + "/" + *it; std::cout << "Submit file: " << local_file.c_str() << std::endl; struct stat st; @@ -592,15 +593,15 @@ bool cmCTestSubmit::SubmitUsingXMLRPC(const cmStdString& localprefix, { return false; } - + unsigned char *fileBuffer = new unsigned char[fileSize]; unsigned char *encodedFileBuffer = new unsigned char[encodedSize]; if ( fread(fileBuffer, 1, fileSize, fp) != fileSize ) { delete [] fileBuffer; delete [] encodedFileBuffer; - return false; fclose(fp); + return false; } fclose(fp); @@ -649,10 +650,10 @@ bool cmCTestSubmit::SubmitUsingXMLRPC(const cmStdString& localprefix, } printf("%s\n", state_name); - } - /* Dispose of our result value. */ - xmlrpc_DECREF(result); + /* Dispose of our result value. */ + xmlrpc_DECREF(result); + } /* Clean up our error-handling environment. */ xmlrpc_env_clean(&env); diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index fa6c4ef573..d33fd7a86b 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -694,7 +694,7 @@ int cmCTest::SubmitResults() ofs << " Submission succesfull" << std::endl; return 1; } - else + else if ( m_DartConfiguration["DropMethod"] == "scp" ) { std::string url; if ( m_DartConfiguration["DropSiteUser"].size() > 0 ) @@ -713,6 +713,11 @@ int cmCTest::SubmitResults() std::cout << " Submission successfull" << std::endl; ofs << " Submission succesfull" << std::endl; } + else + { + std::cout << " Unknown submission method: \"" << m_DartConfiguration["DropMethod"] << "\"" << std::endl; + return 0; + } return 0; } |