From 7574c39ffb7fb56f3bb1fd4568d3670dee8b3e70 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Wed, 28 Dec 2016 17:41:35 -0800
Subject: [PATCH] tools: run-tests: check whether ifstest could remove its
 directories

---
 tools/run-tests.bat | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/tools/run-tests.bat b/tools/run-tests.bat
index 851ec950..88a6ba06 100755
--- a/tools/run-tests.bat
+++ b/tools/run-tests.bat
@@ -345,18 +345,32 @@ if !ERRORLEVEL! neq 1 goto fail
 exit /b 0
 
 :ifstest-memfs-x64-disk
-M:
 call :__ifstest-memfs M: \Device\WinFsp.Disk
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
 :ifstest-memfs-x86-disk
-O:
 call :__ifstest-memfs O: \Device\WinFsp.Disk
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
 :__ifstest-memfs
+%1
+set IfsTestDirectories=^
+	securit^
+	opcreatg^
+	opcreatp^
+	closedel^
+	volinfo^
+	fileinfo^
+	dirinfo^
+	filelock^
+	oplocks^
+	chgnotif^
+	readwr^
+	seccache^
+	reparspt^
+	estream
 set IfsTestMemfsExit=0
 rem call :__ifstest %1 /d %2 /g Security /z /v
 rem if !ERRORLEVEL! neq 0 set IfsTestMemfsExit=1
@@ -386,6 +400,9 @@ rem call :__ifstest %1 /d %2 /g ReparsePoints /z /v
 rem if !ERRORLEVEL! neq 0 set IfsTestMemfsExit=1
 rem call :__ifstest %1 /d %2 /g StreamEnhancements /z /v
 rem if !ERRORLEVEL! neq 0 set IfsTestMemfsExit=1
+for %%d in (!IfsTestDirectories!) do  (
+	if exist %%d (echo :ifstest directory %%d still exists & set IfsTestMemfsExit=1)
+)
 exit /b !IfsTestMemfsExit!
 
 :__ifstest