Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Tests: Factor out RunCMake.GenEx-COMPILE_LANG_AND_ID test

Move the `COMPILE_LANG_AND_ID` cases out of `RunCMake.GeneratorExpression`.
Brad King 5 years ago
parent
931a6702f6
commit
983adb8bed
27 changed files with 14 additions and 8 deletions
Split View Show Diff Stats
  1. 1 0
      Tests/RunCMake/CMakeLists.txt
  2. 3 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/CMakeLists.txt
  3. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command-result.txt
  4. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command-stderr.txt
  5. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command.cmake
  6. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target-result.txt
  7. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target-stderr.txt
  8. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target.cmake
  9. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable-result.txt
  10. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable-stderr.txt
  11. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable.cmake
  12. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library-result.txt
  13. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library-stderr.txt
  14. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library.cmake
  15. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test-result.txt
  16. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test-stderr.txt
  17. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test.cmake
  18. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install-result.txt
  19. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install-stderr.txt
  20. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install.cmake
  21. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources-result.txt
  22. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources-stderr.txt
  23. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources.cmake
  24. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-unknown-lang.cmake
  25. 10 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/RunCMakeTest.cmake
  26. 0 0
      Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/empty.c
  27. 0 8
      Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake

+ 1 - 0
Tests/RunCMake/CMakeLists.txt
View File 

@@ -220,6 +220,7 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES "Watcom")
 
   add_RunCMake_test(GenerateExportHeader)
 
 endif()
 
 add_RunCMake_test(GenEx-COMPILE_LANGUAGE)
 
+add_RunCMake_test(GenEx-COMPILE_LANG_AND_ID)
 
 add_RunCMake_test(GeneratorExpression)
 
 add_RunCMake_test(GeneratorInstance)
 
 add_RunCMake_test(GeneratorPlatform)

+ 3 - 0
Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/CMakeLists.txt
View File 

@@ -0,0 +1,3 @@
 
+cmake_minimum_required(VERSION 3.15)
 
+project(${RunCMake_TEST} NONE)
 
+include(${RunCMake_TEST}.cmake)

+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_custom_command-result.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command-result.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_custom_command-stderr.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command-stderr.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_custom_command.cmake → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command.cmake
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_custom_target-result.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target-result.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_custom_target-stderr.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target-stderr.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_custom_target.cmake → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target.cmake
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_executable-result.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable-result.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_executable-stderr.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable-stderr.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_executable.cmake → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable.cmake
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_library-result.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library-result.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_library-stderr.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library-stderr.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_library.cmake → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library.cmake
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_test-result.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test-result.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_test-stderr.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test-stderr.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-add_test.cmake → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test.cmake
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-install-result.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install-result.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-install-stderr.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install-stderr.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-install.cmake → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install.cmake
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-target_sources-result.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources-result.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-target_sources-stderr.txt → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources-stderr.txt
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-target_sources.cmake → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources.cmake
View File


+ 0 - 0
Tests/RunCMake/GeneratorExpression/COMPILE_LANG_AND_ID-unknown-lang.cmake → Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-unknown-lang.cmake
View File


+ 10 - 0
Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/RunCMakeTest.cmake
View File 

@@ -0,0 +1,10 @@
 
+include(RunCMake)
 
+
 
+run_cmake(COMPILE_LANG_AND_ID-add_custom_target)
 
+run_cmake(COMPILE_LANG_AND_ID-add_custom_command)
 
+run_cmake(COMPILE_LANG_AND_ID-install)
 
+run_cmake(COMPILE_LANG_AND_ID-target_sources)
 
+run_cmake(COMPILE_LANG_AND_ID-add_executable)
 
+run_cmake(COMPILE_LANG_AND_ID-add_library)
 
+run_cmake(COMPILE_LANG_AND_ID-add_test)
 
+run_cmake(COMPILE_LANG_AND_ID-unknown-lang)

+ 0 - 0
Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/empty.c
View File


+ 0 - 8
Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
View File 

@@ -23,14 +23,6 @@ run_cmake(NonValidTarget-TARGET_BUNDLE_DIR)
 
 run_cmake(NonValidTarget-TARGET_BUNDLE_CONTENT_DIR)
 
 run_cmake(NonValidTarget-TARGET_PROPERTY)
 
 run_cmake(NonValidTarget-TARGET_POLICY)
 
-run_cmake(COMPILE_LANG_AND_ID-add_custom_target)
 
-run_cmake(COMPILE_LANG_AND_ID-add_custom_command)
 
-run_cmake(COMPILE_LANG_AND_ID-install)
 
-run_cmake(COMPILE_LANG_AND_ID-target_sources)
 
-run_cmake(COMPILE_LANG_AND_ID-add_executable)
 
-run_cmake(COMPILE_LANG_AND_ID-add_library)
 
-run_cmake(COMPILE_LANG_AND_ID-add_test)
 
-run_cmake(COMPILE_LANG_AND_ID-unknown-lang)
 
 run_cmake(LINK_LANGUAGE-add_custom_target)
 
 run_cmake(LINK_LANGUAGE-add_custom_command)
 
 run_cmake(LINK_LANGUAGE-install)