]> Nishi Git Mirror - gwion.git/commitdiff
:bug: Fix test
authorfennecdjay <astor.jeremie@wanadoo.fr>
Thu, 14 Mar 2019 23:38:59 +0000 (00:38 +0100)
committerfennecdjay <astor.jeremie@wanadoo.fr>
Thu, 14 Mar 2019 23:38:59 +0000 (00:38 +0100)
.travis.yml
help/test.sh

index 263a58ade944a17f7c9f4ea2aa90db39a5f7a531..ec658ecc9145f21ed5d82befd76a7a637dcdb163 100644 (file)
@@ -51,6 +51,7 @@ install:
       export BUILD_ON_WINDOWS=1;
       git clone https://github.com/dlfcn-win32/dlfcn-win32 && cd dlfcn-win32 && ./configure && make.exe && cd ..;
       ls dlfcn-win32;
+      ecport VALGRIND=valgrind.exe;
       export CFLAGS="$CFLAGS -Idlfcn-win32";
       export LDFLAGS="$LDLAGS -Ldlfcn-win32 -lpsapi dlfcn-win32/libdl.a";
       export LIBS="$LIBS -lpsapi";
index 0975493cb5008a38f56aed408c92c7962a98404f..39601ed38f335a2bfa20c384924cc9e199ff9488 100644 (file)
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+: "${VALGRIND:=valgrind}"
 : "${GWION_TEST_DIR:=/tmp}"
 : "${GWION_TEST_PREFIX:=gwt_}"
 
@@ -176,7 +177,7 @@ test_gw(){
   elog=${GWION_TEST_DIR}/${GWION_TEST_PREFIX}$(printf "%04i" "$n").err.log
   vlog=${GWION_TEST_DIR}/${GWION_TEST_PREFIX}$(printf "%04i" "$n").valgrind.log
   rlog=${GWION_TEST_DIR}/${GWION_TEST_PREFIX}$(printf "%04i" "$n").log
-  valgrind --log-file="$vlog" \
+  "$VALGRIND" --log-file="$vlog" \
   ./gwion "$GWOPT" -d "$DRIVER" "$file" > "$slog" 2>"$elog" |:
   ret=$?
   #enable skip