cmake.patch 4.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index aadcb9b..e8e1f50 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -567,8 +567,6 @@ endif()
  6. # Add minimal googletest targets. The provided one has many side-effects, and
  7. # googletest has a very straightforward build.
  8. -add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc)
  9. -target_include_directories(boringssl_gtest PRIVATE third_party/googletest)
  10. include_directories(third_party/googletest/include)
  11. @@ -594,15 +592,14 @@ add_custom_command(
  12. DEPENDS util/embed_test_data.go ${CRYPTO_TEST_DATA}
  13. WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
  14. -add_library(crypto_test_data OBJECT crypto_test_data.cc)
  15. add_subdirectory(crypto)
  16. add_subdirectory(ssl)
  17. -add_subdirectory(ssl/test)
  18. +# add_subdirectory(ssl/test)
  19. add_subdirectory(tool)
  20. add_subdirectory(util/fipstools)
  21. add_subdirectory(util/fipstools/acvp/modulewrapper)
  22. -add_subdirectory(decrepit)
  23. +# add_subdirectory(decrepit)
  24. if(FUZZ)
  25. if(LIBFUZZER_FROM_DEPS)
  26. @@ -653,16 +650,7 @@ else()
  27. add_custom_target(fips_specific_tests_if_any)
  28. endif()
  29. -add_custom_target(
  30. - run_tests
  31. - COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
  32. - ${CMAKE_BINARY_DIR}
  33. - COMMAND cd ssl/test/runner &&
  34. - ${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
  35. - ${HANDSHAKER_ARGS} ${RUNNER_ARGS}
  36. - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
  37. - DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any
  38. - USES_TERMINAL)
  39. +
  40. install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  41. diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
  42. index cf7199c..73cdd70 100644
  43. --- a/crypto/CMakeLists.txt
  44. +++ b/crypto/CMakeLists.txt
  45. @@ -91,7 +91,6 @@ function(perlasm dest src)
  46. endfunction()
  47. add_subdirectory(fipsmodule)
  48. -add_subdirectory(test)
  49. if(FIPS_DELOCATE OR FIPS_SHARED)
  50. SET_SOURCE_FILES_PROPERTIES(fipsmodule/bcm.o PROPERTIES EXTERNAL_OBJECT true)
  51. @@ -478,93 +477,3 @@ endif()
  52. # urandom_test is a separate binary because it needs to be able to observe the
  53. # PRNG initialisation, which means that it can't have other tests running before
  54. # it does.
  55. -add_executable(
  56. - urandom_test
  57. -
  58. - fipsmodule/rand/urandom_test.cc
  59. -)
  60. -
  61. -target_link_libraries(urandom_test test_support_lib boringssl_gtest crypto)
  62. -
  63. -add_dependencies(urandom_test global_target)
  64. -add_dependencies(all_tests urandom_test)
  65. -
  66. -add_executable(
  67. - crypto_test
  68. -
  69. - abi_self_test.cc
  70. - asn1/asn1_test.cc
  71. - base64/base64_test.cc
  72. - bio/bio_test.cc
  73. - blake2/blake2_test.cc
  74. - buf/buf_test.cc
  75. - bytestring/bytestring_test.cc
  76. - chacha/chacha_test.cc
  77. - cipher_extra/aead_test.cc
  78. - cipher_extra/cipher_test.cc
  79. - compiler_test.cc
  80. - conf/conf_test.cc
  81. - constant_time_test.cc
  82. - cpu_arm_linux_test.cc
  83. - crypto_test.cc
  84. - curve25519/ed25519_test.cc
  85. - curve25519/spake25519_test.cc
  86. - curve25519/x25519_test.cc
  87. - ecdh_extra/ecdh_test.cc
  88. - dh_extra/dh_test.cc
  89. - digest_extra/digest_test.cc
  90. - dsa/dsa_test.cc
  91. - err/err_test.cc
  92. - evp/evp_extra_test.cc
  93. - evp/evp_test.cc
  94. - evp/pbkdf_test.cc
  95. - evp/scrypt_test.cc
  96. - fipsmodule/aes/aes_test.cc
  97. - fipsmodule/bn/bn_test.cc
  98. - fipsmodule/cmac/cmac_test.cc
  99. - fipsmodule/ec/ec_test.cc
  100. - fipsmodule/ec/p256-nistz_test.cc
  101. - fipsmodule/ecdsa/ecdsa_test.cc
  102. - fipsmodule/md5/md5_test.cc
  103. - fipsmodule/modes/gcm_test.cc
  104. - fipsmodule/rand/ctrdrbg_test.cc
  105. - fipsmodule/rand/fork_detect_test.cc
  106. - fipsmodule/service_indicator/service_indicator_test.cc
  107. - fipsmodule/sha/sha_test.cc
  108. - hkdf/hkdf_test.cc
  109. - hpke/hpke_test.cc
  110. - hmac_extra/hmac_test.cc
  111. - hrss/hrss_test.cc
  112. - impl_dispatch_test.cc
  113. - lhash/lhash_test.cc
  114. - obj/obj_test.cc
  115. - pem/pem_test.cc
  116. - pkcs7/pkcs7_test.cc
  117. - pkcs8/pkcs8_test.cc
  118. - pkcs8/pkcs12_test.cc
  119. - poly1305/poly1305_test.cc
  120. - pool/pool_test.cc
  121. - rand_extra/rand_test.cc
  122. - refcount_test.cc
  123. - rsa_extra/rsa_test.cc
  124. - self_test.cc
  125. - stack/stack_test.cc
  126. - siphash/siphash_test.cc
  127. - test/file_test_gtest.cc
  128. - thread_test.cc
  129. - trust_token/trust_token_test.cc
  130. - x509/x509_test.cc
  131. - x509/x509_time_test.cc
  132. - x509v3/tab_test.cc
  133. -
  134. - $<TARGET_OBJECTS:crypto_test_data>
  135. - $<TARGET_OBJECTS:boringssl_gtest_main>
  136. -)
  137. -
  138. -add_dependencies(crypto_test global_target)
  139. -
  140. -target_link_libraries(crypto_test test_support_lib boringssl_gtest crypto)
  141. -if(WIN32)
  142. - target_link_libraries(crypto_test ws2_32)
  143. -endif()
  144. -add_dependencies(all_tests crypto_test)
  145. diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
  146. index 67a72ae..249f9e2 100644
  147. --- a/ssl/CMakeLists.txt
  148. +++ b/ssl/CMakeLists.txt
  149. @@ -52,20 +52,3 @@ add_dependencies(ssl global_target)
  150. target_link_libraries(ssl crypto)
  151. -add_executable(
  152. - ssl_test
  153. -
  154. - span_test.cc
  155. - ssl_test.cc
  156. - ssl_c_test.c
  157. -
  158. - $<TARGET_OBJECTS:boringssl_gtest_main>
  159. -)
  160. -
  161. -add_dependencies(ssl_test global_target)
  162. -
  163. -target_link_libraries(ssl_test test_support_lib boringssl_gtest ssl crypto)
  164. -if(WIN32)
  165. - target_link_libraries(ssl_test ws2_32)
  166. -endif()
  167. -add_dependencies(all_tests ssl_test)