Ensure pcap_filter gets killed if a test fails

MAli82 · Oct 6, 2021 · f720bd2 · f720bd2
1 parent fd6e80d
commit f720bd2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/test/make_test.bat b/test/make_test.bat
@@ -1,3 +1,5 @@
+SET SAVEPID=0
+
 echo Testing iflist...
 for /f "TOKENS=1,2" %%a in ('nmap --iflist') do @if %%a==lo0 set devname=%%b
 if not %devname:~0,12%==\Device\NPF_ goto :error
@@ -18,6 +20,7 @@ echo Testing sendpack...
 
 echo Killing pcap_filter...
 taskkill /PID %SAVEPID% || goto :error
+SET SAVEPID=0
 
 echo Reading dump file...
 .\readfile.exe loopback.pcap || goto :error
@@ -48,6 +51,7 @@ echo Testing sendpack...
 
 echo Killing pcap_filter...
 taskkill /PID %SAVEPID% || goto :error
+SET SAVEPID=0
 
 echo Reading dump file...
 .\readfile.exe scanme.pcap || goto :error
@@ -60,5 +64,6 @@ exit /b
 
 :error
 echo Failed: %errorlevel%
+if %SAVEPID% NEQ 0 taskkill /PID %SAVEPID%
 pause
 exit /b %errorlevel%