diff options
author | Brad King <brad.king@kitware.com> | 2009-11-11 18:34:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-11-11 18:34:21 (GMT) |
commit | d2715cae493a16e9187d8e43f36fab90e3239184 (patch) | |
tree | 3bcf711fb6ad7368171e5d33ad75de1fe0ef98a7 /Source/CTest/cmCTestTestHandler.cxx | |
parent | 29ebc97c38a291988e1e16edcbb000bfb879825b (diff) | |
download | CMake-d2715cae493a16e9187d8e43f36fab90e3239184.zip CMake-d2715cae493a16e9187d8e43f36fab90e3239184.tar.gz CMake-d2715cae493a16e9187d8e43f36fab90e3239184.tar.bz2 |
CMake 2.8.0-rc7
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
-rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index a32a335..2491d19 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -82,17 +82,20 @@ bool cmCTestSubdirCommand for ( it = args.begin(); it != args.end(); ++ it ) { cmSystemTools::ChangeDirectory(cwd.c_str()); - std::string fname = cwd; - fname += "/"; - fname += *it; + std::string fname; - //sanity check on relative path; if not, try absolute path - if ( !cmSystemTools::FileIsDirectory(fname.c_str())) + if(cmSystemTools::FileIsFullPath(it->c_str())) { fname = *it; } + else + { + fname = cwd; + fname += "/"; + fname += *it; + } - if ( !cmSystemTools::FileExists(fname.c_str()) ) + if ( !cmSystemTools::FileIsDirectory(fname.c_str()) ) { // No subdirectory? So what... continue; |