From: fennecdjay Date: Fri, 15 Mar 2019 00:56:43 +0000 (+0100) Subject: :bug: TRUE SEVERITY X-Git-Tag: nightly~2667 X-Git-Url: http://10.11.0.4:5575/?a=commitdiff_plain;h=60793aa348fc6d0481ac4661379db1dfff509a52;p=gwion.git :bug: TRUE SEVERITY --- diff --git a/.travis.yml b/.travis.yml index 4434a99b..d5155c48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ install: export BUILD_ON_WINDOWS=1; printf "\033[31m%s033[0m\n" $(which valgrind); git clone https://github.com/dlfcn-win32/dlfcn-win32 && cd dlfcn-win32 && ./configure && make.exe && cd ..; - export VALGRIND=; + export VALGRIND="NO_VALGRIND"; export SEVERITY=2; export CFLAGS="$CFLAGS -Idlfcn-win32"; export LDFLAGS="$LDLAGS -Ldlfcn-win32 -lpsapi dlfcn-win32/libdl.a"; diff --git a/help/test.sh b/help/test.sh index c0375a8a..aab1648f 100644 --- a/help/test.sh +++ b/help/test.sh @@ -177,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 - if [ -z "$VALGRIND" ] + if [ "$VALGRIND" == "NO_VALGRIND" ] then ./gwion "$GWOPT" -d "$DRIVER" "$file" > "$slog" 2>"$elog" |: else "$VALGRIND" --log-file="$vlog" \ diff --git a/src/plug.c b/src/plug.c index 3ebfbfa8..bd22e0e2 100644 --- a/src/plug.c +++ b/src/plug.c @@ -79,8 +79,8 @@ ANN PlugInfo* new_plug(const Vector list) { HANDLE file = FindFirstFileA(gname,&filedata); if(file == INVALID_HANDLE_VALUE) continue; - do plug_get(p, filedata.cFileName); - while(FindNextFile(file,&filedata) == 0); +// do plug_get(p, filedata.cFileName); +// while(FindNextFile(file,&filedata) == 0); FindClose(file); #endif }