From eab5ace757bba8f5491e1a6c1381875c4aeebb07 Mon Sep 17 00:00:00 2001 From: MoustaphaSaad Date: Fri, 31 May 2024 19:52:59 +0300 Subject: fix ssltest changed the ssltest.sh to search to .js file as well. added preload-file link flag to enable access to TEST_SOURCE_DIR --- tests/CMakeLists.txt | 3 +++ tests/ssltest.sh | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8755bf8..1005dfd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -739,6 +739,9 @@ add_platform_test(ssl_versions ssl_versions) # ssltest add_executable(ssltest ssltest.c) target_link_libraries(ssltest ${OPENSSL_TEST_LIBS}) +if(EMSCRIPTEN) + set_target_properties(ssltest PROPERTIES LINK_FLAGS "--preload-file ${TEST_SOURCE_DIR}") +endif() if(NOT MSVC) add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) else() diff --git a/tests/ssltest.sh b/tests/ssltest.sh index 22a8936..29ea0b0 100755 --- a/tests/ssltest.sh +++ b/tests/ssltest.sh @@ -4,17 +4,23 @@ set -e ssltest_bin=./ssltest if [ -e ./ssltest.exe ]; then ssltest_bin=./ssltest.exe +elif [ -e ./ssltest.js ]; then + ssltest_bin="node ./ssltest.js" fi if [ -d ../apps/openssl ]; then openssl_bin=../apps/openssl/openssl if [ -e ../apps/openssl/openssl.exe ]; then openssl_bin=../apps/openssl/openssl.exe + elif [ -e ../apps/openssl/openssl.js ]; then + openssl_bin="node ../apps/openssl/openssl.js" fi else openssl_bin=../apps/openssl if [ -e ../apps/openssl.exe ]; then openssl_bin=../apps/openssl.exe + elif [ -e ../apps/openssl.js ]; then + openssl_bin="node ../apps/openssl.js" fi fi @@ -24,4 +30,4 @@ fi $srcdir/testssl $srcdir/server1-rsa.pem $srcdir/server1-rsa-chain.pem \ $srcdir/ca-root-rsa.pem \ - $ssltest_bin $openssl_bin + "$ssltest_bin" "$openssl_bin" -- cgit v1.2.3-55-g6feb