Skip to content

Commit e0ed372

Browse files
authored
Merge pull request #540 from chipitsine/master
cmake: disable shell-based PKCS#12 tests on MSVC
2 parents d96b8e4 + bede91b commit e0ed372

1 file changed

Lines changed: 19 additions & 17 deletions

File tree

‎cmake/tests.cmake‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,24 +107,26 @@ add_integration_test(NAME test_pkcs12_rfc9337 ${WITH_ENGINE} ${WITH_PROVIDER})
107107
add_integration_test(NAME test_raw_sign_prehash ${WITH_PROVIDER}
108108
LINK_LIBS OpenSSL::Crypto)
109109

110-
if (GOST_BUILD_ENGINE AND GOST_BUILD_PROVIDER)
111-
# Phase 16d: confirm engine.cnf and provider.cnf produce
112-
# structurally equivalent PFXes (same OIDs + length fields, no
113-
# divergence in PBES2/PBKDF2/cipher-params/MAC layout).
114-
add_test(NAME test_pkcs12_rfc9337_cross_mode
115-
COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/test/pkcs12_cross_mode_parity.sh
116-
$<TARGET_FILE:test_pkcs12_rfc9337>
117-
${CMAKE_CURRENT_SOURCE_DIR}/test/engine.cnf
118-
${CMAKE_CURRENT_SOURCE_DIR}/test/provider.cnf)
119-
set_tests_properties(test_pkcs12_rfc9337_cross_mode
120-
PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_COMMON}")
121-
endif()
110+
if (NOT MSVC)
111+
if (GOST_BUILD_ENGINE AND GOST_BUILD_PROVIDER)
112+
# Phase 16d: confirm engine.cnf and provider.cnf produce
113+
# structurally equivalent PFXes (same OIDs + length fields, no
114+
# divergence in PBES2/PBKDF2/cipher-params/MAC layout).
115+
add_test(NAME test_pkcs12_rfc9337_cross_mode
116+
COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/test/pkcs12_cross_mode_parity.sh
117+
$<TARGET_FILE:test_pkcs12_rfc9337>
118+
${CMAKE_CURRENT_SOURCE_DIR}/test/engine.cnf
119+
${CMAKE_CURRENT_SOURCE_DIR}/test/provider.cnf)
120+
set_tests_properties(test_pkcs12_rfc9337_cross_mode
121+
PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_COMMON}")
122+
endif()
122123

123-
if (GOST_BUILD_ENGINE)
124-
add_test(NAME test_pkcs12_rfc9337_cli-with-engine
125-
COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/test/pkcs12_rfc9337.sh)
126-
set_tests_properties(test_pkcs12_rfc9337_cli-with-engine
127-
PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}")
124+
if (GOST_BUILD_ENGINE)
125+
add_test(NAME test_pkcs12_rfc9337_cli-with-engine
126+
COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/test/pkcs12_rfc9337.sh)
127+
set_tests_properties(test_pkcs12_rfc9337_cli-with-engine
128+
PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}")
129+
endif()
128130
endif()
129131

130132
if(TLS13_PATCHED_OPENSSL)

0 commit comments

Comments
 (0)