diff options
author | Brad King <brad.king@kitware.com> | 2013-02-07 13:53:50 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-02-07 13:53:50 (GMT) |
commit | a943b5c4f3ed700f53c554b9f91942ad57047c18 (patch) | |
tree | b65563866837ac68c77d096f6420fcfb9ad24f5b /Source/ctest.cxx | |
parent | 7df291fb6e6971f60cc7b338bcaa81069ed11757 (diff) | |
download | CMake-a943b5c4f3ed700f53c554b9f91942ad57047c18.zip CMake-a943b5c4f3ed700f53c554b9f91942ad57047c18.tar.gz CMake-a943b5c4f3ed700f53c554b9f91942ad57047c18.tar.bz2 |
Fail early if no current working directory exists
Remove the old "nocwd" behavior that attempts to provide the "--help"
output when no working directory is available. The long help output
scrolls the real error message out of typical terminal sizes. Also
execute as little code as possible when no working directory exists.
Diffstat (limited to 'Source/ctest.cxx')
-rw-r--r-- | Source/ctest.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/ctest.cxx b/Source/ctest.cxx index d650777..8de901a 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -273,14 +273,13 @@ int main (int argc, char *argv[]) return cmCTestLaunch::Main(argc, argv); } - int nocwd = 0; cmCTest inst; if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 ) { cmCTestLog(&inst, ERROR_MESSAGE, "Current working directory cannot be established." << std::endl); - nocwd = 1; + return 1; } // If there is a testing input file, check for documentation options @@ -298,7 +297,7 @@ int main (int argc, char *argv[]) } cmDocumentation doc; doc.addCTestStandardDocSections(); - if(doc.CheckOptions(argc, argv) || nocwd) + if(doc.CheckOptions(argc, argv)) { // Construct and print requested documentation. std::vector<cmDocumentationEntry> commands; |