From 218699eb2827ca5f6082b1f9e1e84238cb301155 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 6 Jun 2014 10:39:45 -0400 Subject: Tests: Fix CMakeLib.testRST for relative __FILE__ Pass the test input directory as a runtime argument instead of depending on __FILE__ to locate it. --- Tests/CMakeLib/CMakeLists.txt | 4 +++- Tests/CMakeLib/testRST.cxx | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt index 0e1fe8d..8c99f64 100644 --- a/Tests/CMakeLib/CMakeLists.txt +++ b/Tests/CMakeLib/CMakeLists.txt @@ -13,6 +13,8 @@ set(CMakeLib_TESTS testXMLSafe ) +set(testRST_ARGS ${CMAKE_CURRENT_SOURCE_DIR}) + if(WIN32) list(APPEND CMakeLib_TESTS testVisualStudioSlnParser @@ -39,7 +41,7 @@ if(CMAKE_OSX_ARCHITECTURES AND XCODE endif() foreach(test ${CMakeLib_TESTS}) - add_test(CMakeLib.${test} CMakeLibTests ${test}) + add_test(CMakeLib.${test} CMakeLibTests ${test} ${${test}_ARGS}) endforeach() if(TEST_CompileCommandOutput) diff --git a/Tests/CMakeLib/testRST.cxx b/Tests/CMakeLib/testRST.cxx index bad9560..37cb3fa 100644 --- a/Tests/CMakeLib/testRST.cxx +++ b/Tests/CMakeLib/testRST.cxx @@ -25,9 +25,14 @@ void reportLine(std::ostream& os, bool ret, std::string line, bool eol) } } -int testRST(int, char*[]) +int testRST(int argc, char* argv[]) { - std::string dir = cmSystemTools::GetFilenamePath(__FILE__); + if(argc != 2) + { + std::cerr << "Usage: testRST " << std::endl; + return 1; + } + std::string dir = argv[1]; if(dir.empty()) { dir = "."; -- cgit v0.12