diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-28 20:25:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-28 20:25:49 (GMT) |
| commit | 97c5171d6c1eb0b201662067e9c041003415ae93 (patch) | |
| tree | 19ef7903aafb37f634f1dbf740d633e1355a3e00 /Source/CTest/cmCTestTestHandler.cxx | |
| parent | 8b73f54bc63f50c48d9356c108eec44bb5e0dbc3 (diff) | |
| parent | 667a90a0844a2b00a046e9597811c06905b6347d (diff) | |
| download | CMake-97c5171d6c1eb0b201662067e9c041003415ae93.zip CMake-97c5171d6c1eb0b201662067e9c041003415ae93.tar.gz CMake-97c5171d6c1eb0b201662067e9c041003415ae93.tar.bz2 | |
Merge topic 'dev/add_test-working-directory'
667a90a Fix sentence break in add_test documentation
96309fc Make TestsWorkingDirectory test a C file
a4a5e37 Use iostream to make Borland happy
cfe53cd Fully specify the path to old-signature add_test
017d4e9 Group adding tests with its properties
561cc33 Only test the default cwd with Makefiles
d87bae7 Simplify the _default_cwd derivation
992c74f Use --><-- markers to denote the path
5249551 Flip slashes around on Windows
0a014da Add ctype.h include for toupper()
af12f83 Fix header includes for C++ and Visual Studio
5597aa2 Rename the project to match the test
9bf4165 Add tests for WORKING_DIRECTORY arg to add_test
42de5d0 Add WORKING_DIRECTORY argument to add_test
7679f9f Rename WorkingDirectory test
d95f817 Add the WORKING_DIRECTORY property to tests
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 6eec3c8..6d1af2d 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -2192,7 +2192,6 @@ bool cmCTestTestHandler::SetTestsProperties( { rtit->Labels.push_back(*crit); } - } if ( key == "MEASUREMENT" ) { @@ -2221,6 +2220,10 @@ bool cmCTestTestHandler::SetTestsProperties( std::string(crit->c_str()))); } } + if ( key == "WORKING_DIRECTORY" ) + { + rtit->Directory = val; + } } } } |