From b0a59e42fc47f78522cb47fb2283b25447318806 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Mon, 21 Nov 2016 16:45:10 -0800
Subject: [PATCH] tst: add oplock testsuite run and disable some tests
 according to configuration

---
 tools/run-tests.bat             | 12 ++++++++++++
 tst/winfsp-tests/create-test.c  |  3 ++-
 tst/winfsp-tests/dirctl-test.c  |  3 ++-
 tst/winfsp-tests/info-test.c    |  3 ++-
 tst/winfsp-tests/mount-test.c   |  3 +++
 tst/winfsp-tests/stream-tests.c |  3 ++-
 tst/winfsp-tests/timeout-test.c |  3 +++
 7 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/tools/run-tests.bat b/tools/run-tests.bat
index 38d253d2..00fab8cb 100755
--- a/tools/run-tests.bat
+++ b/tools/run-tests.bat
@@ -32,11 +32,13 @@ for %%f in (^
     :winfsp-tests-x64-mountpoint-drive ^
     :winfsp-tests-x64-mountpoint-dir ^
     :winfsp-tests-x64-no-traverse ^
+    :winfsp-tests-x64-oplock ^
     :winfsp-tests-x86 ^
     :winfsp-tests-x86-case-randomize ^
     :winfsp-tests-x86-mountpoint-drive ^
     :winfsp-tests-x86-mountpoint-dir ^
     :winfsp-tests-x86-no-traverse ^
+    :winfsp-tests-x86-oplock ^
     :winfsp-tests-x64-external-share ^
     :fsx-memfs-x64-disk ^
     :fsx-memfs-x64-net ^
@@ -127,6 +129,11 @@ winfsp-tests-x64 --no-traverse
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:winfsp-tests-x64-oplock
+winfsp-tests-x64 --oplock=filter --resilient
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :winfsp-tests-x86
 winfsp-tests-x86
 if !ERRORLEVEL! neq 0 goto fail
@@ -152,6 +159,11 @@ winfsp-tests-x86 --no-traverse
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:winfsp-tests-x86-oplock
+winfsp-tests-x86 --oplock=filter --resilient
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :winfsp-tests-x64-external-share
 M:
 "%ProjRoot%\build\VStudio\build\%Configuration%\winfsp-tests-x64.exe" --external --share=winfsp-tests-share=M:\ --resilient ^
diff --git a/tst/winfsp-tests/create-test.c b/tst/winfsp-tests/create-test.c
index 18099f07..f2e76390 100644
--- a/tst/winfsp-tests/create-test.c
+++ b/tst/winfsp-tests/create-test.c
@@ -867,7 +867,8 @@ void create_tests(void)
     TEST(create_test);
     TEST(create_related_test);
     TEST(create_sd_test);
-    TEST(create_notraverse_test);
+    if (!OptNoTraverseToken && !OptShareName)
+        TEST(create_notraverse_test);
     TEST(create_backup_test);
     TEST(create_restore_test);
     TEST(create_share_test);
diff --git a/tst/winfsp-tests/dirctl-test.c b/tst/winfsp-tests/dirctl-test.c
index 53388016..13c6d198 100644
--- a/tst/winfsp-tests/dirctl-test.c
+++ b/tst/winfsp-tests/dirctl-test.c
@@ -544,6 +544,7 @@ void dirctl_tests(void)
 {
     TEST(querydir_test);
     TEST(querydir_expire_cache_test);
-    TEST(querydir_buffer_overflow_test);
+    if (!OptShareName)
+        TEST(querydir_buffer_overflow_test);
     TEST(dirnotify_test);
 }
diff --git a/tst/winfsp-tests/info-test.c b/tst/winfsp-tests/info-test.c
index ee4de106..2fb2beca 100644
--- a/tst/winfsp-tests/info-test.c
+++ b/tst/winfsp-tests/info-test.c
@@ -969,7 +969,8 @@ void info_tests(void)
     TEST(delete_access_test);
     TEST(rename_test);
     TEST(rename_caseins_test);
-    TEST(rename_flipflop_test);
+    if (!OptShareName)
+        TEST(rename_flipflop_test);
     TEST(getvolinfo_test);
     TEST(setvolinfo_test);
 }
diff --git a/tst/winfsp-tests/mount-test.c b/tst/winfsp-tests/mount-test.c
index 9f2d1aee..4b1e9a47 100644
--- a/tst/winfsp-tests/mount-test.c
+++ b/tst/winfsp-tests/mount-test.c
@@ -274,6 +274,9 @@ void mount_volume_transact_test(void)
 
 void mount_tests(void)
 {
+    if (NtfsTests || OptOplock)
+        return;
+
     TEST(mount_invalid_test);
     TEST(mount_open_device_test);
     TEST(mount_create_volume_test);
diff --git a/tst/winfsp-tests/stream-tests.c b/tst/winfsp-tests/stream-tests.c
index 947d35d2..ed1890d3 100644
--- a/tst/winfsp-tests/stream-tests.c
+++ b/tst/winfsp-tests/stream-tests.c
@@ -2186,7 +2186,8 @@ void stream_tests(void)
     TEST(stream_setfileinfo_test);
     TEST(stream_delete_test);
     TEST(stream_delete_pending_test);
-    TEST(stream_rename_flipflop_test);
+    if (!OptShareName)
+        TEST(stream_rename_flipflop_test);
     TEST(stream_getsecurity_test);
     TEST(stream_setsecurity_test);
     TEST(stream_getstreaminfo_test);
diff --git a/tst/winfsp-tests/timeout-test.c b/tst/winfsp-tests/timeout-test.c
index d7ce68f1..be942f8e 100644
--- a/tst/winfsp-tests/timeout-test.c
+++ b/tst/winfsp-tests/timeout-test.c
@@ -262,6 +262,9 @@ void timeout_transact_test(void)
 
 void timeout_tests(void)
 {
+    if (NtfsTests || OptOplock)
+        return;
+
     TEST(timeout_pending_test);
     TEST(timeout_transact_test);
 }