summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-20 15:16:40 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-20 15:16:40 (GMT)
commit1fcc01f2074cc5fd56489ccab90457b51082e10e (patch)
treefe2669f1b4408da4a0a0597ade025e48214a2337
parentfca389e78ca8d5fe377a4116dedf8b9307126380 (diff)
parent3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f (diff)
downloadCMake-1fcc01f2074cc5fd56489ccab90457b51082e10e.zip
CMake-1fcc01f2074cc5fd56489ccab90457b51082e10e.tar.gz
CMake-1fcc01f2074cc5fd56489ccab90457b51082e10e.tar.bz2
Merge topic 'fix_delphi_coverage'
3cd2e0e2 Tests: Fix DelphiCoverage test file selection
-rw-r--r--Tests/CMakeLists.txt5
-rw-r--r--Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in (renamed from Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html)0
2 files changed, 3 insertions, 2 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3f28c25..ae61bca 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2587,8 +2587,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
"${CMake_BINARY_DIR}/Testing/DelphiCoverage/DartConfiguration.tcl")
file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/src"
DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
- file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html"
- DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
+ configure_file(
+ "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in"
+ "${CMake_BINARY_DIR}/Testing/DelphiCoverage/UTCovTest(UTCovTest.pas).html")
add_test(NAME CTestDelphiCoverage
COMMAND cmake -E chdir
${CMake_BINARY_DIR}/Testing/DelphiCoverage
diff --git a/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html b/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in
index 9caaea3..9caaea3 100644
--- a/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html
+++ b/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in