From 4e3b3ec3680d291106f9075488299df873aec65b Mon Sep 17 00:00:00 2001 From: fennecdjay Date: Fri, 15 Mar 2019 00:38:59 +0100 Subject: [PATCH] :bug: Fix test --- .travis.yml | 1 + help/test.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 263a58ad..ec658ecc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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"; diff --git a/help/test.sh b/help/test.sh index 0975493c..39601ed3 100644 --- a/help/test.sh +++ b/help/test.sh @@ -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 -- 2.43.0