tools: run-tests: perform leak-test after all WinFsp drives have been unmounted

This commit is contained in:
Bill Zissimopoulos 2016-11-02 22:12:39 -07:00
parent 5f1b723fab
commit deee32b743

View File

@ -51,7 +51,6 @@ for %%f in (^
:winfstest-memfs-x64-net ^ :winfstest-memfs-x64-net ^
:winfstest-memfs-x86-disk ^ :winfstest-memfs-x86-disk ^
:winfstest-memfs-x86-net ^ :winfstest-memfs-x86-net ^
:leak-test ^
) do ( ) do (
echo === Running %%f echo === Running %%f
@ -87,11 +86,16 @@ launchctl-x64 stop memfs64 testdsk >nul
launchctl-x64 stop memfs64 testnet >nul launchctl-x64 stop memfs64 testnet >nul
launchctl-x64 stop memfs32 testdsk >nul launchctl-x64 stop memfs32 testdsk >nul
launchctl-x64 stop memfs32 testnet >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 set /a total=testpass+testfail
echo === Total: %testpass%/%total% echo === Total: %testpass%/%total%
if not %testfail%==0 goto fail if not %testfail%==0 goto fail
call :leak-test
if !ERRORLEVEL! neq 0 goto fail
exit /b 0 exit /b 0
:fail :fail
@ -269,9 +273,9 @@ for /F "tokens=1,2 delims=:" %%i in ('verifier /query ^| findstr ^
) )
set /A TotalAlloc=PagedAlloc+NonPagedAlloc set /A TotalAlloc=PagedAlloc+NonPagedAlloc
if !TotalAlloc! equ 0 ( if !TotalAlloc! equ 0 (
echo Leaks: None echo === Leaks: None
) else ( ) else (
echo Leaks: !NonPagedAlloc! NP / !PagedAlloc! P echo === Leaks: !NonPagedAlloc! NP / !PagedAlloc! P
goto fail goto fail
) )
exit /b 0 exit /b 0