summaryrefslogtreecommitdiff
path: root/wintest
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2012-05-31 11:13:59 +0200
committerKai Blin <kai@samba.org>2012-06-21 21:55:20 +0200
commit226dbc116da7eb59fd59a9fb8a88c05a13b74e05 (patch)
treeab26955172802a023a5c6728bc9c2e8b0cd482e7 /wintest
parent9fcd4a83a5c75d227846467756c64d2bf5adde9a (diff)
downloadsamba-226dbc116da7eb59fd59a9fb8a88c05a13b74e05.tar.gz
samba-226dbc116da7eb59fd59a9fb8a88c05a13b74e05.tar.bz2
samba-226dbc116da7eb59fd59a9fb8a88c05a13b74e05.zip
wintest: add option to use ntvfs instead of s3fs
Signed-off-by: Kai Blin <kai@samba.org>
Diffstat (limited to 'wintest')
-rwxr-xr-xwintest/test-s4-howto.py3
-rw-r--r--wintest/wintest.py6
2 files changed, 8 insertions, 1 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 91ae0a245b..110d65a057 100755
--- 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 36711d947e..a6da60681e 100644
--- 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', "")