File 4801-Support-running-make-test-from-wsl.patch of Package erlang
From ab3f314e94714f2cb050d01cb15560cd1728ffb5 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Thu, 24 Jun 2021 10:06:48 +0200
Subject: [PATCH 1/2] Support running make test from wsl
Use ct_run.exe and convert paths to windows
variants so we can test with win32 erlang from wsl if
the build environment is setup with WSLcross=true.
---
make/test_target_script.sh | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/make/test_target_script.sh b/make/test_target_script.sh
index cc18f06797..1bc4893c39 100755
--- a/make/test_target_script.sh
+++ b/make/test_target_script.sh
@@ -220,14 +220,21 @@ SPEC_FILE=""
if [ -z "${ARGS}" ]
then
SPEC_FLAG="-spec"
- SPEC_FILE="$MAKE_TEST_REL_DIR/$APPLICATION.spec"
+ if [ "${WSLcross}" != "true" ] ; then
+ SPEC_FILE="$MAKE_TEST_REL_DIR/$APPLICATION.spec"
+ else
+ SPEC_FILE=`w32_path.sh -m "$MAKE_TEST_REL_DIR/$APPLICATION.spec"`
+ fi
ARGS="$SPEC_FLAG $SPEC_FILE"
fi
# Compile test server
(cd "$ERL_TOP/lib/common_test/test_server" && make)
# Run ct_run
cd $MAKE_TEST_REL_DIR
-$CT_RUN -logdir $MAKE_TEST_CT_LOGS\
+
+if [ "${WSLcross}" != "true" ]
+then
+ $CT_RUN -logdir $MAKE_TEST_CT_LOGS\
-pa "$ERL_TOP/lib/common_test/test_server"\
${ARGS}\
-erl_args\
@@ -241,6 +248,26 @@ $CT_RUN -logdir $MAKE_TEST_CT_LOGS\
-sname test_server\
-rsh ssh\
${ERL_ARGS}
+else
+ WIN_MAKE_TEST_CT_LOGS=`w32_path.sh -m "$MAKE_TEST_CT_LOGS"`
+ WIN_MAKE_TEST_DIR=`w32_path.sh -m "$MAKE_TEST_DIR"`
+ WIN_ERL_TOP=`w32_path.sh -m "$ERL_TOP"`
+ $CT_RUN.exe -logdir $WIN_MAKE_TEST_CT_LOGS\
+ -pa "$WIN_ERL_TOP/lib/common_test/test_server"\
+ ${ARGS}\
+ -erl_args\
+ -env ERL_CRASH_DUMP "$WIN_MAKE_TEST_DIR/${APPLICATION}_erl_crash.dump"\
+ -boot start_sasl\
+ -sasl errlog_type error\
+ -pz "$WIN_ERL_TOP/lib/common_test/test_server"\
+ -pz "."\
+ -ct_test_vars "{net_dir,\"\"}"\
+ -noshell\
+ -sname test_server\
+ -rsh ssh\
+ ${ERL_ARGS}
+fi
+
CT_RUN_STATUS=$?
if [ $CT_RUN_STATUS = "0" ]
then
--
2.26.2