BUG: More VS8 fixes

This commit is contained in:
Andy Cedilnik 2006-03-01 12:50:03 -05:00
parent c7f0940b4e
commit 98dc57c0ae
1 changed files with 30 additions and 12 deletions

View File

@ -169,10 +169,16 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const cmStdString& localprefix,
// Now run off and do what you've been told! // Now run off and do what you've been told!
res = ::curl_easy_perform(curl); res = ::curl_easy_perform(curl);
cmCTestLog(m_CTest, DEBUG, "CURL output: [" if ( chunk.size() > 0 )
<< cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl); {
cmCTestLog(m_CTest, DEBUG, "CURL debug output: [" cmCTestLog(m_CTest, DEBUG, "CURL output: ["
<< cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl); << 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); fclose(ftpfile);
if ( res ) if ( res )
@ -326,10 +332,16 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const cmStdString& localprefix,
// Now run off and do what you've been told! // Now run off and do what you've been told!
res = ::curl_easy_perform(curl); res = ::curl_easy_perform(curl);
cmCTestLog(m_CTest, DEBUG, "CURL output: [" if ( chunk.size() > 0 )
<< cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl); {
cmCTestLog(m_CTest, DEBUG, "CURL debug output: [" cmCTestLog(m_CTest, DEBUG, "CURL output: ["
<< cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl); << 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); fclose(ftpfile);
if ( res ) if ( res )
@ -454,10 +466,16 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(const std::set<cmStdString>& files,
return false; return false;
} }
cmCTestLog(m_CTest, DEBUG, "CURL output: [" if ( chunk.size() > 0 )
<< cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]" << std::endl); {
cmCTestLog(m_CTest, DEBUG, "CURL debug output: [" cmCTestLog(m_CTest, DEBUG, "CURL output: ["
<< cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]" << std::endl); << 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 // always cleanup
::curl_easy_cleanup(curl); ::curl_easy_cleanup(curl);