From 0ae8fb606a2869baa04c25f489b612f306caf784 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Wed, 31 Aug 2022 14:29:25 +0200
Subject: [PATCH] [tests] fix promoting when using test script
---
bin/test.sh | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/bin/test.sh b/bin/test.sh
index 4192edf44b6..48c322544af 100755
--- a/bin/test.sh
+++ b/bin/test.sh
@@ -29,6 +29,7 @@ LOGS=
TESTS=
SAVE=
+DUNE_ALIAS=
DUNE_OPT=
DUNE_LOG=./.test-errors.log
CACHEDIR=$(pwd -P)/.wp-cache
@@ -169,9 +170,10 @@ function PullCache
# --------------------------------------------------------------------------
[ "$DUNE_LOG" = "" ] || rm -rf $DUNE_LOG
-function TestAlias
+function RunAlias
{
+ Head "Running tests..."
if [ "$DUNE_LOG" = "" ]; then
Run dune build $DUNE_OPT $@
elif [ "$SAVE" != "yes" ] && [ "$VERBOSE" != "yes" ]; then
@@ -204,8 +206,8 @@ function TestDir
CFG="(config $CONFIG)"
;;
esac
- Head "Running test on directory $1 $CFG"
- TestAlias @$ALIAS
+ Head "Register test on directory $1 $CFG"
+ DUNE_ALIAS="${DUNE_ALIAS} @$ALIAS"
}
# --------------------------------------------------------------------------
@@ -233,15 +235,15 @@ function TestFile
else
ALIAS=$DIR/$RESULT/${FILE%.*}.wtests
fi
- Head "Running test on file $1 $CFG"
- TestAlias @$ALIAS
+ Head "Register test on file $1 $CFG"
+ DUNE_ALIAS="${DUNE_ALIAS} @$ALIAS"
}
# --------------------------------------------------------------------------
# --- Tests Processing
# --------------------------------------------------------------------------
-function RunTests
+function Register
{
while [ "$1" != "" ]
do
@@ -251,7 +253,7 @@ function RunTests
TestFile $1
else
case $1 in
- @*) Head "Running test on alias $1"; TestAlias $1;;
+ @*) Head "Register test on alias $1"; DUNE_ALIAS="${DUNE_ALIAS} $1";;
*) ErrorUsage "ERROR: don't known what to do with '$1'";;
esac
fi
@@ -349,5 +351,6 @@ do
esac
shift
done
-RunTests $TESTS
+Register $TESTS
+RunAlias ${DUNE_ALIAS}
Status $DUNE_LOG
--
GitLab