summaryrefslogtreecommitdiffstats
path: root/Tests/Module/ExternalData
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-04-13 12:02:17 (GMT)
committerBrad King <brad.king@kitware.com>2018-04-13 12:06:48 (GMT)
commitbb66cea6c510b85f8c84e047f9e8a25ef1ada17c (patch)
tree6b5ab830ab5436d5866d44e67d40a6a6a993f990 /Tests/Module/ExternalData
parent07604a767ddb98b1020b546aa257bd7a965caf0a (diff)
downloadCMake-bb66cea6c510b85f8c84e047f9e8a25ef1ada17c.zip
CMake-bb66cea6c510b85f8c84e047f9e8a25ef1ada17c.tar.gz
CMake-bb66cea6c510b85f8c84e047f9e8a25ef1ada17c.tar.bz2
Tests: Avoid duplicate rules in ExternalData test
In commit v3.7.0-rc1~158^2 (ExternalData: Tolerate files duplicated across multiple targets, 2016-07-07) we added a test case for repeating the same data file reference in three different targets in the same directory in order to exercise its corresponding fix. However, we re-used the top-level `Data.dat` file which is already produced by an unrelated test case. `ninja` diagnoses the duplicate rule. Update the test to use a dedicated data file name for the three-times repeated case to avoid this conflict. It still covers the original purpose of the test.
Diffstat (limited to 'Tests/Module/ExternalData')
-rw-r--r--Tests/Module/ExternalData/Data5/CMakeLists.txt6
-rw-r--r--Tests/Module/ExternalData/Data5/Data5.dat.md51
2 files changed, 4 insertions, 3 deletions
diff --git a/Tests/Module/ExternalData/Data5/CMakeLists.txt b/Tests/Module/ExternalData/Data5/CMakeLists.txt
index 13c7fab..ea67f05 100644
--- a/Tests/Module/ExternalData/Data5/CMakeLists.txt
+++ b/Tests/Module/ExternalData/Data5/CMakeLists.txt
@@ -2,21 +2,21 @@
ExternalData_Add_Test(Data5.A
NAME Data5Check.A
COMMAND ${CMAKE_COMMAND}
- -D Data5=DATA{../Data.dat}
+ -D Data5=DATA{Data5.dat}
-P ${CMAKE_CURRENT_SOURCE_DIR}/Data5Check.cmake
)
ExternalData_Add_Target(Data5.A)
ExternalData_Add_Test(Data5.B
NAME Data5Check.B
COMMAND ${CMAKE_COMMAND}
- -D Data5=DATA{../Data.dat}
+ -D Data5=DATA{Data5.dat}
-P ${CMAKE_CURRENT_SOURCE_DIR}/Data5Check.cmake
)
ExternalData_Add_Target(Data5.B)
ExternalData_Add_Test(Data5.C
NAME Data5Check.C
COMMAND ${CMAKE_COMMAND}
- -D Data5=DATA{../Data.dat}
+ -D Data5=DATA{Data5.dat}
-P ${CMAKE_CURRENT_SOURCE_DIR}/Data5Check.cmake
)
ExternalData_Add_Target(Data5.C)
diff --git a/Tests/Module/ExternalData/Data5/Data5.dat.md5 b/Tests/Module/ExternalData/Data5/Data5.dat.md5
new file mode 100644
index 0000000..70e39bd
--- /dev/null
+++ b/Tests/Module/ExternalData/Data5/Data5.dat.md5
@@ -0,0 +1 @@
+8c018830e3efa5caf3c7415028335a57