fix servertest

changed the servertest.sh to search to .js file as well.
added preload-file link flag to enable access to TEST_SOURCE_DIR

2 files changed, 5 insertions, 0 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ead7af9..0da7022 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -644,6 +644,9 @@ add_platform_test(rsa_test rsa_test)
 # servertest
 add_executable(servertest servertest.c)
 target_link_libraries(servertest ${OPENSSL_TEST_LIBS})
+if(EMSCRIPTEN)
+        set_target_properties(servertest PROPERTIES LINK_FLAGS "--preload-file ${TEST_SOURCE_DIR}")
+endif()
 if(NOT MSVC)
         add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh)
 else()
diff --git a/tests/servertest.sh b/tests/servertest.sh
index d6497bd..1662332 100755
--- a/tests/servertest.sh
+++ b/tests/servertest.sh
@@ -4,6 +4,8 @@ set -e
 servertest_bin=./servertest
 if [ -e ./servertest.exe ]; then
         servertest_bin=./servertest.exe
+elif [ -e ./servertest.js ]; then
+        servertest_bin="node ./servertest.js"
 fi
 
 if [ -z $srcdir ]; then