summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-03-01 17:50:03 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-03-01 17:50:03 (GMT)
commit98dc57c0aed5507648defe98665d0954a585fbe5 (patch)
tree1187e38628a7cd0eac8e3f2fd23db9962f3f779e
parentc7f0940b4e5bca9165d6111bf7a505ec9ae8c8c2 (diff)
downloadCMake-98dc57c0aed5507648defe98665d0954a585fbe5.zip
CMake-98dc57c0aed5507648defe98665d0954a585fbe5.tar.gz
CMake-98dc57c0aed5507648defe98665d0954a585fbe5.tar.bz2
BUG: More VS8 fixes
-rw-r--r--Source/CTest/cmCTestSubmitHandler.cxx42
1 files changed, 30 insertions, 12 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index a536e4f..e8feade 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -169,10 +169,16 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const cmStdString& localprefix,
// Now run off and do what you've been told!
res = ::curl_easy_perform(curl);
- cmCTestLog(m_CTest, DEBUG, "CURL output: ["
- << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl);
- cmCTestLog(m_CTest, DEBUG, "CURL debug output: ["
- << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl);
+ if ( chunk.size() > 0 )
+ {
+ cmCTestLog(m_CTest, DEBUG, "CURL output: ["
+ << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl);
+ }
+ if ( chunkDebug.size() > 0 )
+ {
+ cmCTestLog(m_CTest, DEBUG, "CURL debug output: ["
+ << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl);
+ }
fclose(ftpfile);
if ( res )
@@ -326,10 +332,16 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const cmStdString& localprefix,
// Now run off and do what you've been told!
res = ::curl_easy_perform(curl);
- cmCTestLog(m_CTest, DEBUG, "CURL output: ["
- << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl);
- cmCTestLog(m_CTest, DEBUG, "CURL debug output: ["
- << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl);
+ if ( chunk.size() > 0 )
+ {
+ cmCTestLog(m_CTest, DEBUG, "CURL output: ["
+ << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl);
+ }
+ if ( chunkDebug.size() > 0 )
+ {
+ cmCTestLog(m_CTest, DEBUG, "CURL debug output: ["
+ << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl);
+ }
fclose(ftpfile);
if ( res )
@@ -454,10 +466,16 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(const std::set<cmStdString>& files,
return false;
}
- cmCTestLog(m_CTest, DEBUG, "CURL output: ["
- << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl);
- cmCTestLog(m_CTest, DEBUG, "CURL debug output: ["
- << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl);
+ if ( chunk.size() > 0 )
+ {
+ cmCTestLog(m_CTest, DEBUG, "CURL output: ["
+ << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl);
+ }
+ if ( chunkDebug.size() > 0 )
+ {
+ cmCTestLog(m_CTest, DEBUG, "CURL debug output: ["
+ << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl);
+ }
// always cleanup
::curl_easy_cleanup(curl);