From 226dbc116da7eb59fd59a9fb8a88c05a13b74e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= Date: Thu, 31 May 2012 11:13:59 +0200 Subject: [PATCH] wintest: add option to use ntvfs instead of s3fs Signed-off-by: Kai Blin --- wintest/test-s4-howto.py | 3 ++- wintest/wintest.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index 91ae0a245b5..110d65a0577 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 36711d947e4..a6da60681ea 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', "")