Sfoglia il codice sorgente

Coverage for OUTPUT_REQUIRED_FILES

Sebastien Barre 24 anni fa
parent
commit
a249b4d188

+ 5 - 4
Tests/Complex/Executable/CMakeLists.txt

@@ -25,11 +25,12 @@ TARGET_LINK_LIBRARIES(complex
 
 #
 # Output the files required by 'complex' to a file.
-# The 'complex' executable will then test if this file exists and remove it.
-# The contents of this file is not tested (absolute paths).
 #
-#OUTPUT_REQUIRED_FILES(${Complex_SOURCE_DIR}/Executable/complex.cxx 
-#	              ${Complex_BINARY_DIR}/Executable/complex-required.txt)  
+# This test has been moved to the 'required' subdir so that it
+# has no side-effects on the current Makefile (duplicated source file
+# due to source list expansion done twice).
+#
+SUBDIRS(required)
 
 #
 # Extra coverage.Not used.

+ 1 - 1
Tests/Complex/Executable/complex.cxx

@@ -516,7 +516,7 @@ int main()
   // the file was removed the last time 'complex' was run, and it is
   // only created during a build.
 
-  // TestAndRemoveFile(BINARY_DIR "/Executable/complex-required.txt");
+  TestAndRemoveFile(BINARY_DIR "/Executable/required/complex-required.txt");
 
   // ----------------------------------------------------------------------
   // Summary

+ 8 - 0
Tests/Complex/Executable/required/CMakeLists.txt

@@ -0,0 +1,8 @@
+#
+# Output the files required by 'complex' to a file.
+# The 'complex' executable will then test if this file exists and remove it.
+# The contents of this file is not tested (absolute paths).
+#
+OUTPUT_REQUIRED_FILES(
+   ${Complex_SOURCE_DIR}/Executable/complex.cxx 
+   ${Complex_BINARY_DIR}/Executable/required/complex-required.txt)  

+ 5 - 4
Tests/ComplexOneConfig/Executable/CMakeLists.txt

@@ -25,11 +25,12 @@ TARGET_LINK_LIBRARIES(complex
 
 #
 # Output the files required by 'complex' to a file.
-# The 'complex' executable will then test if this file exists and remove it.
-# The contents of this file is not tested (absolute paths).
 #
-#OUTPUT_REQUIRED_FILES(${Complex_SOURCE_DIR}/Executable/complex.cxx 
-#	              ${Complex_BINARY_DIR}/Executable/complex-required.txt)  
+# This test has been moved to the 'required' subdir so that it
+# has no side-effects on the current Makefile (duplicated source file
+# due to source list expansion done twice).
+#
+SUBDIRS(required)
 
 #
 # Extra coverage.Not used.

+ 1 - 1
Tests/ComplexOneConfig/Executable/complex.cxx

@@ -516,7 +516,7 @@ int main()
   // the file was removed the last time 'complex' was run, and it is
   // only created during a build.
 
-  // TestAndRemoveFile(BINARY_DIR "/Executable/complex-required.txt");
+  TestAndRemoveFile(BINARY_DIR "/Executable/required/complex-required.txt");
 
   // ----------------------------------------------------------------------
   // Summary

+ 8 - 0
Tests/ComplexOneConfig/Executable/required/CMakeLists.txt

@@ -0,0 +1,8 @@
+#
+# Output the files required by 'complex' to a file.
+# The 'complex' executable will then test if this file exists and remove it.
+# The contents of this file is not tested (absolute paths).
+#
+OUTPUT_REQUIRED_FILES(
+   ${Complex_SOURCE_DIR}/Executable/complex.cxx 
+   ${Complex_BINARY_DIR}/Executable/required/complex-required.txt)  

+ 5 - 4
Tests/ComplexRelativePaths/Executable/CMakeLists.txt

@@ -25,11 +25,12 @@ TARGET_LINK_LIBRARIES(complex
 
 #
 # Output the files required by 'complex' to a file.
-# The 'complex' executable will then test if this file exists and remove it.
-# The contents of this file is not tested (absolute paths).
 #
-#OUTPUT_REQUIRED_FILES(${Complex_SOURCE_DIR}/Executable/complex.cxx 
-#	              ${Complex_BINARY_DIR}/Executable/complex-required.txt)  
+# This test has been moved to the 'required' subdir so that it
+# has no side-effects on the current Makefile (duplicated source file
+# due to source list expansion done twice).
+#
+SUBDIRS(required)
 
 #
 # Extra coverage.Not used.

+ 1 - 1
Tests/ComplexRelativePaths/Executable/complex.cxx

@@ -516,7 +516,7 @@ int main()
   // the file was removed the last time 'complex' was run, and it is
   // only created during a build.
 
-  // TestAndRemoveFile(BINARY_DIR "/Executable/complex-required.txt");
+  TestAndRemoveFile(BINARY_DIR "/Executable/required/complex-required.txt");
 
   // ----------------------------------------------------------------------
   // Summary

+ 8 - 0
Tests/ComplexRelativePaths/Executable/required/CMakeLists.txt

@@ -0,0 +1,8 @@
+#
+# Output the files required by 'complex' to a file.
+# The 'complex' executable will then test if this file exists and remove it.
+# The contents of this file is not tested (absolute paths).
+#
+OUTPUT_REQUIRED_FILES(
+   ${Complex_SOURCE_DIR}/Executable/complex.cxx 
+   ${Complex_BINARY_DIR}/Executable/required/complex-required.txt)