wintest: add option to use ntvfs instead of s3fs

Signed-off-by: Kai Blin <kai@samba.org>

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 91ae0a245b525447e906fe96fed69093bdd6519d..110d65a05770e25fab4a96c4167f219cb57720a0 100755 (executable)
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -35,7 +35,8 @@ def provision_s4(t, func_level="2008"):
                '--option=interfaces=${INTERFACE}',
                '--host-ip=${INTERFACE_IP}',
                '--option=bind interfaces only=yes',
-               '--option=rndc command=${RNDC} -c${PREFIX}/etc/rndc.conf']
+               '--option=rndc command=${RNDC} -c${PREFIX}/etc/rndc.conf',
+               '${USE_NTVFS}']
     if t.getvar('INTERFACE_IPV6'):
         provision.append('--host-ip6=${INTERFACE_IPV6}')
     t.run_cmd(provision)

diff --git a/wintest/wintest.py b/wintest/wintest.py
index 36711d947e4d77cfc3d76ce9cb30ea73680c992c..a6da60681ea558fb40a393cd06c052598cd4eb8c 100644 (file)
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -901,6 +901,7 @@ RebootOnCompletion=No
         self.parser.add_option("--prefix", type='string', default=None, help='override install prefix')
         self.parser.add_option("--sourcetree", type='string', default=None, help='override sourcetree location')
         self.parser.add_option("--nocleanup", action='store_true', default=False, help='disable cleanup code')
+        self.parser.add_option("--use-ntvfs", action='store_true', default=False, help='use NTVFS for the fileserver')
 
         self.opts, self.args = self.parser.parse_args()
 
@@ -934,3 +935,8 @@ RebootOnCompletion=No
             self.info('cleaning')
             self.chdir('${SOURCETREE}/' + subdir)
             self.run_cmd('make clean')
+
+        if self.opts.use_ntvfs:
+            self.setvar('USE_NTVFS', "--use-ntvfs")
+        else:
+            self.setvar('USE_NTVFS', "")