From 877bd97ba8d6f992687a1b3779991b10580ca803 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Sun, 12 Feb 2017 10:42:14 -0800
Subject: [PATCH] tst: winfsp-tests: exec-test

---
 tools/run-tests.bat          |  5 ++--
 tst/winfsp-tests/exec-test.c | 53 ++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/tools/run-tests.bat b/tools/run-tests.bat
index 32887def..42c11f48 100755
--- a/tools/run-tests.bat
+++ b/tools/run-tests.bat
@@ -508,7 +508,8 @@ L:
 
 "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-%1.exe" ^
     --external --resilient --case-insensitive-cmp --share-prefix="\passthrough\%TMP::=$%\passthrough-%1\test" ^
-    -create_allocation_test -getfileinfo_name_test -rename_flipflop_test -rename_mmap_test -reparse* -stream*
+    -create_allocation_test -getfileinfo_name_test -rename_flipflop_test -rename_mmap_test -exec_rename_dir_test ^
+    -reparse* -stream*
 if !ERRORLEVEL! neq 0 set SamplePassthroughExit=1
 
 popd
@@ -547,7 +548,7 @@ L:
 "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-%1.exe" ^
     --external --resilient --case-insensitive-cmp --share-prefix="\passthrough-fuse\%TMP::=$%\passthrough-fuse-%1\test" ^
     -create_allocation_test -create_notraverse_test -create_backup_test -create_restore_test -create_namelen_test ^
-    -getfileinfo_name_test -setfileinfo_test -delete_access_test -delete_mmap_test -rename_flipflop_test -rename_mmap_test -setsecurity_test ^
+    -getfileinfo_name_test -setfileinfo_test -delete_access_test -delete_mmap_test -rename_flipflop_test -rename_mmap_test -setsecurity_test -exec_rename_dir_test ^
     -reparse* -stream*
 if !ERRORLEVEL! neq 0 set SamplePassthroughExit=1
 
diff --git a/tst/winfsp-tests/exec-test.c b/tst/winfsp-tests/exec-test.c
index 4cee39f6..e422f065 100644
--- a/tst/winfsp-tests/exec-test.c
+++ b/tst/winfsp-tests/exec-test.c
@@ -283,9 +283,62 @@ static void exec_rename_test(void)
     }
 }
 
+static void exec_rename_dir_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoTimeout)
+{
+    void *memfs = memfs_start_ex(Flags, FileInfoTimeout);
+
+    WCHAR Dir1Path[MAX_PATH], Dir2Path[MAX_PATH], FilePath[MAX_PATH];
+    HANDLE Process;
+
+    StringCbPrintfW(Dir1Path, sizeof Dir1Path, L"%s%s\\dir1",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    StringCbPrintfW(Dir2Path, sizeof Dir2Path, L"%s%s\\dir2",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\helper.exe",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    ASSERT(CreateDirectoryW(Dir1Path, 0));
+
+    ExecHelper(FilePath, 1000, &Process);
+
+    ASSERT(MoveFileExW(Dir1Path, Dir2Path, MOVEFILE_REPLACE_EXISTING));
+    ASSERT(MoveFileExW(Dir2Path, Dir1Path, MOVEFILE_REPLACE_EXISTING));
+
+    WaitHelper(Process, 1000);
+
+    ASSERT(DeleteFileW(FilePath));
+
+    ASSERT(RemoveDirectoryW(Dir1Path));
+
+    memfs_stop(memfs);
+}
+
+static void exec_rename_dir_test(void)
+{
+    if (NtfsTests)
+    {
+        WCHAR DirBuf[MAX_PATH];
+        GetTestDirectory(DirBuf);
+        exec_rename_dir_dotest(-1, DirBuf, 0);
+    }
+    if (WinFspDiskTests)
+    {
+        exec_rename_dir_dotest(MemfsDisk, 0, 0);
+        exec_rename_dir_dotest(MemfsDisk, 0, 1000);
+    }
+    if (WinFspNetTests)
+    {
+        exec_rename_dir_dotest(MemfsNet, L"\\\\memfs\\share", 0);
+        exec_rename_dir_dotest(MemfsNet, L"\\\\memfs\\share", 1000);
+    }
+}
+
 void exec_tests(void)
 {
     TEST(exec_test);
     TEST(exec_delete_test);
     TEST(exec_rename_test);
+    TEST(exec_rename_dir_test);
 }