Browse Source

Tests: Speed up RunCMake.GeneratorExpression

Avoid enabling languages in cases that do not need them.
Brad King 7 years ago
parent
commit
234a069de3
25 changed files with 30 additions and 71 deletions
  1. 3 3
      Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-stderr.txt
  2. 1 2
      Tests/RunCMake/GeneratorExpression/BadTargetTypeObject.cmake
  3. 1 1
      Tests/RunCMake/GeneratorExpression/CMP0044-WARN.cmake
  4. 1 1
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt
  5. 2 6
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command.cmake
  6. 1 1
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt
  7. 1 4
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target.cmake
  8. 1 1
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt
  9. 0 3
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable.cmake
  10. 1 1
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt
  11. 0 3
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library.cmake
  12. 1 1
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt
  13. 1 4
      Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources.cmake
  14. 1 1
      Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID-stderr.txt
  15. 1 5
      Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID.cmake
  16. 1 1
      Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION-stderr.txt
  17. 1 5
      Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION.cmake
  18. 1 1
      Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID-stderr.txt
  19. 3 7
      Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID.cmake
  20. 1 1
      Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION-stderr.txt
  21. 3 7
      Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION.cmake
  22. 1 1
      Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY-stderr.txt
  23. 1 5
      Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY.cmake
  24. 1 1
      Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY-stderr.txt
  25. 1 5
      Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY.cmake

+ 3 - 3
Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
+CMake Error at BadTargetTypeObject.cmake:2 \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<TARGET_FILE:objlib>
@@ -7,7 +7,7 @@ CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 +
-CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
+CMake Error at BadTargetTypeObject.cmake:2 \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<TARGET_SONAME_FILE:objlib>
@@ -16,7 +16,7 @@ CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 +
-CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
+CMake Error at BadTargetTypeObject.cmake:2 \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<TARGET_LINKER_FILE:objlib>

+ 1 - 2
Tests/RunCMake/GeneratorExpression/BadTargetTypeObject.cmake

@@ -1,5 +1,4 @@
-enable_language(C)
-add_library(objlib OBJECT empty.c)
+add_library(objlib OBJECT)
 add_custom_target(check ALL COMMAND echo
   $<TARGET_FILE:objlib>
   $<TARGET_SONAME_FILE:objlib>

+ 1 - 1
Tests/RunCMake/GeneratorExpression/CMP0044-WARN.cmake

@@ -1,5 +1,5 @@
 
-project(CMP0044-WARN)
+enable_language(C)
 
 string(TOLOWER ${CMAKE_C_COMPILER_ID} lc_test)
 if (lc_test STREQUAL CMAKE_C_COMPILER_ID)

+ 1 - 1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-add_custom_command.cmake:6 \(add_custom_command\):
+CMake Error at COMPILE_LANGUAGE-add_custom_command.cmake:2 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>

+ 2 - 6
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command.cmake

@@ -1,8 +1,4 @@
-
-enable_language(C)
-
-add_library(empty empty.c)
-
-add_custom_command(TARGET empty PRE_BUILD
+add_custom_target(drive)
+add_custom_command(TARGET drive PRE_BUILD
   COMMAND ${CMAKE_COMMAND} -E echo $<COMPILE_LANGUAGE>
 )

+ 1 - 1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-add_custom_target.cmake:4 \(add_custom_target\):
+CMake Error at COMPILE_LANGUAGE-add_custom_target.cmake:1 \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>

+ 1 - 4
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target.cmake

@@ -1,6 +1,3 @@
-
-enable_language(C)
-
-add_custom_target(empty
+add_custom_target(drive
   COMMAND ${CMAKE_COMMAND} -E echo $<COMPILE_LANGUAGE>
 )

+ 1 - 1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-add_executable.cmake:4 \(add_executable\):
+CMake Error at COMPILE_LANGUAGE-add_executable.cmake:1 \(add_executable\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>

+ 0 - 3
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable.cmake

@@ -1,4 +1 @@
-
-enable_language(C)
-
 add_executable(empty empty.$<COMPILE_LANGUAGE>)

+ 1 - 1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-add_library.cmake:4 \(add_library\):
+CMake Error at COMPILE_LANGUAGE-add_library.cmake:1 \(add_library\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>

+ 0 - 3
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library.cmake

@@ -1,4 +1 @@
-
-enable_language(C)
-
 add_library(empty empty.$<COMPILE_LANGUAGE>)

+ 1 - 1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-target_sources.cmake:5 \(target_sources\):
+CMake Error at COMPILE_LANGUAGE-target_sources.cmake:2 \(target_sources\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>

+ 1 - 4
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources.cmake

@@ -1,5 +1,2 @@
-
-enable_language(C)
-
-add_library(empty empty.c)
+add_library(empty)
 target_sources(empty PRIVATE empty.$<COMPILE_LANGUAGE>)

+ 1 - 1
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at NonValidTarget-CXX_COMPILER_ID.cmake:4 \(add_custom_command\):
+CMake Error at NonValidTarget-CXX_COMPILER_ID.cmake:1 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<CXX_COMPILER_ID>

+ 1 - 5
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID.cmake

@@ -1,8 +1,4 @@
-
-enable_language(CXX)
-
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
   COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<CXX_COMPILER_ID>.cpp"
 )
-
-add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")
+add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

+ 1 - 1
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at NonValidTarget-CXX_COMPILER_VERSION.cmake:4 \(add_custom_command\):
+CMake Error at NonValidTarget-CXX_COMPILER_VERSION.cmake:1 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<CXX_COMPILER_VERSION>

+ 1 - 5
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION.cmake

@@ -1,8 +1,4 @@
-
-enable_language(CXX)
-
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
   COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<CXX_COMPILER_VERSION>.cpp"
 )
-
-add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")
+add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

+ 1 - 1
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at NonValidTarget-C_COMPILER_ID.cmake:4 \(add_custom_command\):
+CMake Error at NonValidTarget-C_COMPILER_ID.cmake:1 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<C_COMPILER_ID>

+ 3 - 7
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID.cmake

@@ -1,8 +1,4 @@
-
-enable_language(CXX)
-
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
-  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<C_COMPILER_ID>.cpp"
+add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c"
+  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.c" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<C_COMPILER_ID>.c"
 )
-
-add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")
+add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c")

+ 1 - 1
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at NonValidTarget-C_COMPILER_VERSION.cmake:4 \(add_custom_command\):
+CMake Error at NonValidTarget-C_COMPILER_VERSION.cmake:1 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<C_COMPILER_VERSION>

+ 3 - 7
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION.cmake

@@ -1,8 +1,4 @@
-
-enable_language(CXX)
-
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
-  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<C_COMPILER_VERSION>.cpp"
+add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c"
+  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.c" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<C_COMPILER_VERSION>.c"
 )
-
-add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")
+add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c")

+ 1 - 1
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at NonValidTarget-TARGET_POLICY.cmake:4 \(add_custom_command\):
+CMake Error at NonValidTarget-TARGET_POLICY.cmake:1 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<TARGET_POLICY:CMP0004>

+ 1 - 5
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY.cmake

@@ -1,8 +1,4 @@
-
-enable_language(CXX)
-
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
   COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<TARGET_POLICY:CMP0004>.cpp"
 )
-
-add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")
+add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

+ 1 - 1
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY-stderr.txt

@@ -1,4 +1,4 @@
-CMake Error at NonValidTarget-TARGET_PROPERTY.cmake:4 \(add_custom_command\):
+CMake Error at NonValidTarget-TARGET_PROPERTY.cmake:1 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<TARGET_PROPERTY:NotAProperty>

+ 1 - 5
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY.cmake

@@ -1,8 +1,4 @@
-
-enable_language(CXX)
-
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
   COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<TARGET_PROPERTY:NotAProperty>.cpp"
 )
-
-add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")
+add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")