From 66d5fe98df89713ed18ffc34febc1fb66cfe557a Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Tue, 25 Oct 2016 14:03:26 -0700
Subject: [PATCH] tst: winfsp-tests: add --ntfs option

---
 tst/winfsp-tests/memfs-test.c   |  3 ---
 tst/winfsp-tests/winfsp-tests.c | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tst/winfsp-tests/memfs-test.c b/tst/winfsp-tests/memfs-test.c
index c7d87498..193cea2e 100644
--- a/tst/winfsp-tests/memfs-test.c
+++ b/tst/winfsp-tests/memfs-test.c
@@ -11,7 +11,6 @@ void *memfs_start_ex(ULONG Flags, ULONG FileInfoTimeout)
 {
     if (-1 == Flags)
     {
-        AddNetShareIfNeeded();
         memfs_running = 1;
         return 0;
     }
@@ -39,7 +38,6 @@ void *memfs_start_ex(ULONG Flags, ULONG FileInfoTimeout)
     Result = MemfsStart(Memfs);
     ASSERT(NT_SUCCESS(Result));
 
-    AddNetShareIfNeeded();
     memfs_running = 1;
 
     return Memfs;
@@ -52,7 +50,6 @@ void *memfs_start(ULONG Flags)
 
 void memfs_stop(void *data)
 {
-    RemoveNetShareIfNeeded();
     memfs_running = 0;
 
     if (0 == data)
diff --git a/tst/winfsp-tests/winfsp-tests.c b/tst/winfsp-tests/winfsp-tests.c
index 50938363..9a849854 100644
--- a/tst/winfsp-tests/winfsp-tests.c
+++ b/tst/winfsp-tests/winfsp-tests.c
@@ -301,7 +301,14 @@ int main(int argc, char *argv[])
         const char *a = argv[argi];
         if ('-' == a[0])
         {
-            if (0 == strcmp("--case-insensitive", a))
+            if (0 == strcmp("--ntfs", a) || 0 == strcmp("--external", a))
+            {
+                NtfsTests = 1;
+                WinFspDiskTests = 0;
+                WinFspNetTests = 0;
+                rmarg(argv, argc, argi);
+            }
+            else if (0 == strcmp("--case-insensitive", a))
             {
                 OptCaseInsensitive = TRUE;
                 rmarg(argv, argc, argi);
@@ -341,6 +348,7 @@ int main(int argc, char *argv[])
                         OptSharePrefixLength = (ULONG)
                             (sizeof OptShareComputer - 2 * sizeof(WCHAR) + (wcslen(OptShareName) * sizeof(WCHAR)));
 
+                        WinFspDiskTests = 0;
                         WinFspNetTests = 0;
                     }
                 }
@@ -356,8 +364,13 @@ int main(int argc, char *argv[])
         }
     }
 
+    if (!NtfsTests && OptShareName)
+        ABORT("option --share requires --ntfs/--external");
+
     DisableBackupRestorePrivileges();
 
+    AddNetShareIfNeeded();
+
     myrandseed = (unsigned)time(0);
 
     tlib_run_tests(argc, argv);