From deee32b743b9931ee853e9c9b5195885e927cb80 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Wed, 2 Nov 2016 22:12:39 -0700 Subject: [PATCH] tools: run-tests: perform leak-test after all WinFsp drives have been unmounted --- tools/run-tests.bat | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/run-tests.bat b/tools/run-tests.bat index 60b495ce..29038893 100644 --- a/tools/run-tests.bat +++ b/tools/run-tests.bat @@ -51,7 +51,6 @@ for %%f in (^ :winfstest-memfs-x64-net ^ :winfstest-memfs-x86-disk ^ :winfstest-memfs-x86-net ^ - :leak-test ^ ) do ( echo === Running %%f @@ -87,11 +86,16 @@ launchctl-x64 stop memfs64 testdsk >nul launchctl-x64 stop memfs64 testnet >nul launchctl-x64 stop memfs32 testdsk >nul launchctl-x64 stop memfs32 testnet >nul +rem Cannot use timeout under cygwin/mintty: "Input redirection is not supported" +waitfor 7BF47D72F6664550B03248ECFE77C7DD /t 3 2>nul set /a total=testpass+testfail echo === Total: %testpass%/%total% if not %testfail%==0 goto fail +call :leak-test +if !ERRORLEVEL! neq 0 goto fail + exit /b 0 :fail @@ -269,9 +273,9 @@ for /F "tokens=1,2 delims=:" %%i in ('verifier /query ^| findstr ^ ) set /A TotalAlloc=PagedAlloc+NonPagedAlloc if !TotalAlloc! equ 0 ( - echo Leaks: None + echo === Leaks: None ) else ( - echo Leaks: !NonPagedAlloc! NP / !PagedAlloc! P + echo === Leaks: !NonPagedAlloc! NP / !PagedAlloc! P goto fail ) exit /b 0