Browse Source

Tests: Port GenerateExportHeader test to RunCMake infrastructure

This will allow build failure cases to be added later.
Brad King 9 years ago
parent
commit
fc3dab0ea9
41 changed files with 27 additions and 2 deletions
  1. 0 1
      Tests/CMakeLists.txt
  2. 3 0
      Tests/RunCMake/CMakeLists.txt
  3. 3 0
      Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
  4. 1 0
      Tests/RunCMake/GenerateExportHeader/GEH-build-stderr.txt
  5. 1 0
      Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt
  6. 1 0
      Tests/RunCMake/GenerateExportHeader/GEH.cmake
  7. 17 0
      Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake
  8. 0 0
      Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
  9. 0 0
      Tests/RunCMake/GenerateExportHeader/c_identifier/c_identifier_class.cpp
  10. 0 0
      Tests/RunCMake/GenerateExportHeader/c_identifier/c_identifier_class.h
  11. 0 0
      Tests/RunCMake/GenerateExportHeader/c_identifier/main.cpp
  12. 0 0
      Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
  13. 0 0
      Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
  14. 0 0
      Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp
  15. 0 0
      Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
  16. 0 0
      Tests/RunCMake/GenerateExportHeader/libshared/CMakeLists.txt
  17. 0 0
      Tests/RunCMake/GenerateExportHeader/libshared/libshared.cpp
  18. 0 0
      Tests/RunCMake/GenerateExportHeader/libshared/libshared.h
  19. 0 0
      Tests/RunCMake/GenerateExportHeader/libstatic/CMakeLists.txt
  20. 0 0
      Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.cpp
  21. 0 0
      Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
  22. 0 0
      Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt
  23. 0 0
      Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in
  24. 0 0
      Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp
  25. 0 0
      Tests/RunCMake/GenerateExportHeader/nodeprecated/src/someclass.cpp
  26. 0 0
      Tests/RunCMake/GenerateExportHeader/nodeprecated/src/someclass.h
  27. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/Empty/libshared_export.h
  28. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/Empty/libstatic_export.h
  29. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/MinGW/libshared_export.h
  30. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/MinGW/libstatic_export.h
  31. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/UNIX/libshared_export.h
  32. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/UNIX/libstatic_export.h
  33. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h
  34. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h
  35. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/Win32-Clang/libshared_export.h
  36. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/Win32-Clang/libstatic_export.h
  37. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/Win32/libshared_export.h
  38. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/Win32/libstatic_export.h
  39. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/WinEmpty/libshared_export.h
  40. 0 0
      Tests/RunCMake/GenerateExportHeader/reference/WinEmpty/libstatic_export.h
  41. 1 1
      Utilities/Scripts/clang-format.bash

+ 0 - 1
Tests/CMakeLists.txt

@@ -485,7 +485,6 @@ if(BUILD_TESTING)
     )
     )
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Module/ExternalData")
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Module/ExternalData")
 
 
-  ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
   ADD_TEST_MACRO(Module.FindDependency FindDependency)
   ADD_TEST_MACRO(Module.FindDependency FindDependency)
 
 
   ADD_TEST_MACRO(Module.WriteCompilerDetectionHeader WriteCompilerDetectionHeader)
   ADD_TEST_MACRO(Module.WriteCompilerDetectionHeader WriteCompilerDetectionHeader)

+ 3 - 0
Tests/RunCMake/CMakeLists.txt

@@ -141,6 +141,9 @@ add_RunCMake_test(DisallowedCommands)
 add_RunCMake_test(ExternalData)
 add_RunCMake_test(ExternalData)
 add_RunCMake_test(FeatureSummary)
 add_RunCMake_test(FeatureSummary)
 add_RunCMake_test(FPHSA)
 add_RunCMake_test(FPHSA)
+if(NOT CMAKE_C_COMPILER_ID MATCHES "Watcom")
+  add_RunCMake_test(GenerateExportHeader)
+endif()
 add_RunCMake_test(GeneratorExpression)
 add_RunCMake_test(GeneratorExpression)
 add_RunCMake_test(GeneratorPlatform)
 add_RunCMake_test(GeneratorPlatform)
 add_RunCMake_test(GeneratorToolset)
 add_RunCMake_test(GeneratorToolset)

+ 3 - 0
Tests/RunCMake/GenerateExportHeader/CMakeLists.txt

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

+ 1 - 0
Tests/RunCMake/GenerateExportHeader/GEH-build-stderr.txt

@@ -0,0 +1 @@
+.*

+ 1 - 0
Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt

@@ -0,0 +1 @@
+.*

+ 1 - 0
Tests/Module/GenerateExportHeader/CMakeLists.txt → Tests/RunCMake/GenerateExportHeader/GEH.cmake

@@ -78,6 +78,7 @@ add_subdirectory(lib_shared_and_static)
 add_compiler_export_flags()
 add_compiler_export_flags()
 
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR})
 
 
 message("#### COMPILER_HAS_DEPRECATED: " ${COMPILER_HAS_DEPRECATED})
 message("#### COMPILER_HAS_DEPRECATED: " ${COMPILER_HAS_DEPRECATED})
 message("#### COMPILER_HAS_HIDDEN_VISIBILITY: " ${COMPILER_HAS_HIDDEN_VISIBILITY})
 message("#### COMPILER_HAS_HIDDEN_VISIBILITY: " ${COMPILER_HAS_HIDDEN_VISIBILITY})

+ 17 - 0
Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake

@@ -0,0 +1,17 @@
+include(RunCMake)
+
+function(run_GEH)
+  # Use a single build tree for a few tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/GEH-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  if(RunCMake_GENERATOR MATCHES "Make|Ninja")
+    set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
+  endif()
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  run_cmake(GEH)
+  run_cmake_command(GEH-build ${CMAKE_COMMAND} --build . --config Debug)
+  run_cmake_command(GEH-run ${RunCMake_TEST_BINARY_DIR}/GenerateExportHeader)
+endfunction()
+
+run_GEH()

+ 0 - 0
Tests/Module/GenerateExportHeader/c_identifier/CMakeLists.txt → Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt


+ 0 - 0
Tests/Module/GenerateExportHeader/c_identifier/c_identifier_class.cpp → Tests/RunCMake/GenerateExportHeader/c_identifier/c_identifier_class.cpp


+ 0 - 0
Tests/Module/GenerateExportHeader/c_identifier/c_identifier_class.h → Tests/RunCMake/GenerateExportHeader/c_identifier/c_identifier_class.h


+ 0 - 0
Tests/Module/GenerateExportHeader/c_identifier/main.cpp → Tests/RunCMake/GenerateExportHeader/c_identifier/main.cpp


+ 0 - 0
Tests/Module/GenerateExportHeader/exportheader_test.cpp → Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp


+ 0 - 0
Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt → Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt


+ 0 - 0
Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp → Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp


+ 0 - 0
Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h → Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h


+ 0 - 0
Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt → Tests/RunCMake/GenerateExportHeader/libshared/CMakeLists.txt


+ 0 - 0
Tests/Module/GenerateExportHeader/libshared/libshared.cpp → Tests/RunCMake/GenerateExportHeader/libshared/libshared.cpp


+ 0 - 0
Tests/Module/GenerateExportHeader/libshared/libshared.h → Tests/RunCMake/GenerateExportHeader/libshared/libshared.h


+ 0 - 0
Tests/Module/GenerateExportHeader/libstatic/CMakeLists.txt → Tests/RunCMake/GenerateExportHeader/libstatic/CMakeLists.txt


+ 0 - 0
Tests/Module/GenerateExportHeader/libstatic/libstatic.cpp → Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.cpp


+ 0 - 0
Tests/Module/GenerateExportHeader/libstatic/libstatic.h → Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h


+ 0 - 0
Tests/Module/GenerateExportHeader/nodeprecated/CMakeLists.txt → Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt


+ 0 - 0
Tests/Module/GenerateExportHeader/nodeprecated/CMakeLists.txt.in → Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in


+ 0 - 0
Tests/Module/GenerateExportHeader/nodeprecated/src/main.cpp → Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp


+ 0 - 0
Tests/Module/GenerateExportHeader/nodeprecated/src/someclass.cpp → Tests/RunCMake/GenerateExportHeader/nodeprecated/src/someclass.cpp


+ 0 - 0
Tests/Module/GenerateExportHeader/nodeprecated/src/someclass.h → Tests/RunCMake/GenerateExportHeader/nodeprecated/src/someclass.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h → Tests/RunCMake/GenerateExportHeader/reference/Empty/libshared_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h → Tests/RunCMake/GenerateExportHeader/reference/Empty/libstatic_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/MinGW/libshared_export.h → Tests/RunCMake/GenerateExportHeader/reference/MinGW/libshared_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/MinGW/libstatic_export.h → Tests/RunCMake/GenerateExportHeader/reference/MinGW/libstatic_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/UNIX/libshared_export.h → Tests/RunCMake/GenerateExportHeader/reference/UNIX/libshared_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/UNIX/libstatic_export.h → Tests/RunCMake/GenerateExportHeader/reference/UNIX/libstatic_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h → Tests/RunCMake/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h → Tests/RunCMake/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/Win32-Clang/libshared_export.h → Tests/RunCMake/GenerateExportHeader/reference/Win32-Clang/libshared_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/Win32-Clang/libstatic_export.h → Tests/RunCMake/GenerateExportHeader/reference/Win32-Clang/libstatic_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/Win32/libshared_export.h → Tests/RunCMake/GenerateExportHeader/reference/Win32/libshared_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/Win32/libstatic_export.h → Tests/RunCMake/GenerateExportHeader/reference/Win32/libstatic_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/WinEmpty/libshared_export.h → Tests/RunCMake/GenerateExportHeader/reference/WinEmpty/libshared_export.h


+ 0 - 0
Tests/Module/GenerateExportHeader/reference/WinEmpty/libstatic_export.h → Tests/RunCMake/GenerateExportHeader/reference/WinEmpty/libstatic_export.h


+ 1 - 1
Utilities/Scripts/clang-format.bash

@@ -126,7 +126,7 @@ $git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
   egrep -z -v '^Utilities/(KW|cm).*/' |
   egrep -z -v '^Utilities/(KW|cm).*/' |
 
 
   # Exclude reference content.
   # Exclude reference content.
-  egrep -z -v '^Tests/Module/GenerateExportHeader/reference/' |
+  egrep -z -v '^Tests/RunCMake/GenerateExportHeader/reference/' |
 
 
   # Exclude manually-formatted sources (e.g. with long lines).
   # Exclude manually-formatted sources (e.g. with long lines).
   egrep -z -v '^Tests/PositionIndependentTargets/pic_test.h' |
   egrep -z -v '^Tests/PositionIndependentTargets/pic_test.h' |