From e7931e28fd0935628f6c9d3092e8085b96df84fe Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Wed, 23 Nov 2016 21:26:21 -0800
Subject: [PATCH] tst: make non-essential and long running tests optional

---
 tools/run-tests.bat             |  4 ++--
 tst/winfsp-tests/mount-test.c   | 10 +++++-----
 tst/winfsp-tests/oplock-test.c  | 18 +++++++++---------
 tst/winfsp-tests/timeout-test.c |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tools/run-tests.bat b/tools/run-tests.bat
index 00fab8cb..b64d3020 100755
--- a/tools/run-tests.bat
+++ b/tools/run-tests.bat
@@ -105,7 +105,7 @@ exit /b 0
 exit /b 1
 
 :winfsp-tests-x64
-winfsp-tests-x64
+winfsp-tests-x64 +*
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
@@ -135,7 +135,7 @@ if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
 :winfsp-tests-x86
-winfsp-tests-x86
+winfsp-tests-x86 +*
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
diff --git a/tst/winfsp-tests/mount-test.c b/tst/winfsp-tests/mount-test.c
index 4b1e9a47..59e2bebe 100644
--- a/tst/winfsp-tests/mount-test.c
+++ b/tst/winfsp-tests/mount-test.c
@@ -277,9 +277,9 @@ void mount_tests(void)
     if (NtfsTests || OptOplock)
         return;
 
-    TEST(mount_invalid_test);
-    TEST(mount_open_device_test);
-    TEST(mount_create_volume_test);
-    TEST(mount_volume_cancel_test);
-    TEST(mount_volume_transact_test);
+    TEST_OPT(mount_invalid_test);
+    TEST_OPT(mount_open_device_test);
+    TEST_OPT(mount_create_volume_test);
+    TEST_OPT(mount_volume_cancel_test);
+    TEST_OPT(mount_volume_transact_test);
 }
diff --git a/tst/winfsp-tests/oplock-test.c b/tst/winfsp-tests/oplock-test.c
index d6fedb81..199ca2e9 100644
--- a/tst/winfsp-tests/oplock-test.c
+++ b/tst/winfsp-tests/oplock-test.c
@@ -475,13 +475,13 @@ void oplock_tests(void)
     if (OptShareName || OptOplock)
         return;
 
-    TEST(oplock_level1_test);
-    TEST(oplock_level2_test);
-    TEST(oplock_batch_test);
-    TEST(oplock_filter_test);
-    TEST(oplock_rwh_test);
-    TEST(oplock_rw_test);
-    TEST(oplock_rh_test);
-    TEST(oplock_r_test);
-    TEST(oplock_not_granted_test);
+    TEST_OPT(oplock_level1_test);
+    TEST_OPT(oplock_level2_test);
+    TEST_OPT(oplock_batch_test);
+    TEST_OPT(oplock_filter_test);
+    TEST_OPT(oplock_rwh_test);
+    TEST_OPT(oplock_rw_test);
+    TEST_OPT(oplock_rh_test);
+    TEST_OPT(oplock_r_test);
+    TEST_OPT(oplock_not_granted_test);
 }
diff --git a/tst/winfsp-tests/timeout-test.c b/tst/winfsp-tests/timeout-test.c
index be942f8e..3fdc626c 100644
--- a/tst/winfsp-tests/timeout-test.c
+++ b/tst/winfsp-tests/timeout-test.c
@@ -265,6 +265,6 @@ void timeout_tests(void)
     if (NtfsTests || OptOplock)
         return;
 
-    TEST(timeout_pending_test);
-    TEST(timeout_transact_test);
+    TEST_OPT(timeout_pending_test);
+    TEST_OPT(timeout_transact_test);
 }