diff options
author | David Cole <david.cole@kitware.com> | 2011-10-25 19:34:26 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-10-25 19:34:26 (GMT) |
commit | bd216ef63a57ed7cc868885f8796e3eab9355a8d (patch) | |
tree | f83da612e731ec3efa0f84e168cbb77237d65ba8 /Source/CTest | |
parent | 4701843974ef7404212f9a057cba4961076b07c8 (diff) | |
parent | ceff6ec5254bbee898ac6a193624dba5ccf18e56 (diff) | |
download | CMake-bd216ef63a57ed7cc868885f8796e3eab9355a8d.zip CMake-bd216ef63a57ed7cc868885f8796e3eab9355a8d.tar.gz CMake-bd216ef63a57ed7cc868885f8796e3eab9355a8d.tar.bz2 |
Merge topic 'some-documentation-fixes'
ceff6ec ccmake: Factor toggle key help instructions.
19da106 ccmake: Document '/' key.
fd63219 ccmake: Align 'g' and 'q' key instructions.
bfb0ed4 Usage: Add missing exepath argument in get_prerequisites documentation.
de51264 Usage: Print help, version and copyright options in usage information.
9ae0604 Usage: Document all options printing the version number.
3353d84 Usage: Document all options printing usage information.
1b612ca Usage: Document -j|--parallel option in help message.
6be15ed Doxygen: Remove dependency on VTK when building doxygen.
a92f14f Doxygen: Fix warnings.
faede37 Doxygen: Generate call graph and relationships.
dd13ecd Doxygen: Improve code documentation.
d0b3a7f Fix typo.
d3d7e45 Remove trailing white-spaces.
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestLaunch.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestSubmitHandler.h | 28 |
2 files changed, 16 insertions, 14 deletions
diff --git a/Source/CTest/cmCTestLaunch.h b/Source/CTest/cmCTestLaunch.h index cd876d0..7457e83 100644 --- a/Source/CTest/cmCTestLaunch.h +++ b/Source/CTest/cmCTestLaunch.h @@ -24,7 +24,7 @@ class cmCTestLaunch { public: /** Entry point from ctest executable main(). */ - static int Main(int argc, const char* const* argv); + static int Main(int argc, const char* const argv[]); private: // Initialize the launcher from its command line. cmCTestLaunch(int argc, const char* const* argv); diff --git a/Source/CTest/cmCTestSubmitHandler.h b/Source/CTest/cmCTestSubmitHandler.h index e7755b1..14eac80 100644 --- a/Source/CTest/cmCTestSubmitHandler.h +++ b/Source/CTest/cmCTestSubmitHandler.h @@ -18,7 +18,7 @@ * \brief Helper class for CTest * * Submit testing results - * + * */ class cmCTestSubmitHandler : public cmCTestGenericHandler { @@ -47,35 +47,37 @@ private: /** * Submit file using various ways */ - bool SubmitUsingFTP(const cmStdString& localprefix, + bool SubmitUsingFTP(const cmStdString& localprefix, const std::set<cmStdString>& files, - const cmStdString& remoteprefix, + const cmStdString& remoteprefix, const cmStdString& url); - bool SubmitUsingHTTP(const cmStdString& localprefix, + bool SubmitUsingHTTP(const cmStdString& localprefix, const std::set<cmStdString>& files, - const cmStdString& remoteprefix, + const cmStdString& remoteprefix, const cmStdString& url); bool SubmitUsingSCP(const cmStdString& scp_command, - const cmStdString& localprefix, + const cmStdString& localprefix, const std::set<cmStdString>& files, - const cmStdString& remoteprefix, + const cmStdString& remoteprefix, const cmStdString& url); - bool SubmitUsingCP( const cmStdString& localprefix, + bool SubmitUsingCP( const cmStdString& localprefix, const std::set<cmStdString>& files, - const cmStdString& remoteprefix, + const cmStdString& remoteprefix, const cmStdString& url); bool TriggerUsingHTTP(const std::set<cmStdString>& files, - const cmStdString& remoteprefix, + const cmStdString& remoteprefix, const cmStdString& url); - bool SubmitUsingXMLRPC(const cmStdString& localprefix, + bool SubmitUsingXMLRPC(const cmStdString& localprefix, const std::set<cmStdString>& files, - const cmStdString& remoteprefix, + const cmStdString& remoteprefix, const cmStdString& url); - void ParseResponse(std::vector<char>); + typedef std::vector<char> cmCTestSubmitHandlerVectorOfChar; + + void ParseResponse(cmCTestSubmitHandlerVectorOfChar chunk); std::string GetSubmitResultsPrefix(); |