summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestBuildHandler.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-02-12 18:00:22 (GMT)
committerBrad King <brad.king@kitware.com>2009-02-12 18:00:22 (GMT)
commit7435355ec8ca10d3d6ef07d975e1f0d9a60b681d (patch)
treec9474211de01f33a296ebea49eb27ab665d02629 /Source/CTest/cmCTestBuildHandler.cxx
parent4f369610f58c165fbf80ab75a93d45a1d9af6362 (diff)
downloadCMake-7435355ec8ca10d3d6ef07d975e1f0d9a60b681d.zip
CMake-7435355ec8ca10d3d6ef07d975e1f0d9a60b681d.tar.gz
CMake-7435355ec8ca10d3d6ef07d975e1f0d9a60b681d.tar.bz2
ENH: Report file names relative to source dir
This teaches cmCTestLaunch to report source files that lie under the top source directory relative to the top.
Diffstat (limited to 'Source/CTest/cmCTestBuildHandler.cxx')
-rw-r--r--Source/CTest/cmCTestBuildHandler.cxx13
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index a576960..d85df86 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -752,7 +752,7 @@ private:
cmCTestBuildHandler* Handler;
cmCTest* CTest;
- void WriteScrapeMatchers();
+ void WriteLauncherConfig();
void WriteScrapeMatchers(const char* purpose,
std::vector<std::string> const& matchers);
};
@@ -784,7 +784,7 @@ cmCTestBuildHandler::LaunchHelper::LaunchHelper(cmCTestBuildHandler* handler):
{
// Enable launcher fragments.
cmSystemTools::MakeDirectory(launchDir.c_str());
- this->WriteScrapeMatchers();
+ this->WriteLauncherConfig();
std::string launchEnv = "CTEST_LAUNCH_LOGS=";
launchEnv += launchDir;
cmSystemTools::PutEnv(launchEnv.c_str());
@@ -808,12 +808,19 @@ cmCTestBuildHandler::LaunchHelper::~LaunchHelper()
}
//----------------------------------------------------------------------------
-void cmCTestBuildHandler::LaunchHelper::WriteScrapeMatchers()
+void cmCTestBuildHandler::LaunchHelper::WriteLauncherConfig()
{
this->WriteScrapeMatchers("Warning",
this->Handler->ReallyCustomWarningMatches);
this->WriteScrapeMatchers("WarningSuppress",
this->Handler->ReallyCustomWarningExceptions);
+
+ // Give some testing configuration information to the launcher.
+ std::string fname = this->Handler->CTestLaunchDir;
+ fname += "/CTestLaunchConfig.cmake";
+ cmGeneratedFileStream fout(fname.c_str());
+ std::string srcdir = this->CTest->GetCTestConfiguration("SourceDirectory");
+ fout << "set(CTEST_SOURCE_DIRECTORY \"" << srcdir << "\")\n";
}
//----------------------------------------------------------------------------