Changeset 78675 in vbox for trunk/src/VBox/ValidationKit/tests/additions/tdAddSharedFolders1.py

Timestamp:

May 23, 2019 12:09:12 AM (6 years ago)

Author:

vboxsync

Message:

tdAddBasic1.py,tdAddSharedFolders1.py: Enabled shared folder testing after more adjustments. bugref:9172

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddSharedFolders1.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/tests/additions/tdAddSharedFolders1.py

@@ -54 +54 @@
         base.SubTestDriverBase.__init__(self, 'add-shared-folders', oTstDrv);
 
-        self.asTestsDef = [ 'fsperf', ];
-        self.asTests    = self.asTestsDef;
+        self.asTestsDef  = [ 'fsperf', ];
+        self.asTests     = self.asTestsDef;
+        self.asExtraArgs = [];
 
     def parseOption(self, asArgs, iArg):
@@ -70 +71 @@
                                                  % (s, ' '.join(self.asTestsDef)));
             return iNext;
+        elif asArgs[iArg] == '--add-shared-folders-extra-arg':
+            iArg += 1;
+            iNext = self.oTstDrv.requireMoreArgs(1, asArgs, iArg);
+            self.asExtraArgs.append(asArgs[iArg]);
+            return iNext;
         return iArg;
 
@@ -76 +82 @@
         reporter.log('  --add-shared-folders-tests <t1[:t2[:]]>');
         reporter.log('      Default: all  (%s)' % (':'.join(self.asTestsDef)));
+        reporter.log('  --add-shared-folders-extra-args <fsperf-arg>');
+        reporter.log('      Adds an extra FsPerf argument.  Can be repeated.');
+
         return True;
 
@@ -158 +167 @@
         if fSkip is False:
             # Common arguments:
-            asArgs = ['FsPerf', '-d', sMountPoint1 + sGuestSlash + 'fstestdir-1', '-m200'];
-
-            # Skip mmap on older windows systems without CcCoherencyFlushAndPurgeCache (>= w7).
+            asArgs = ['FsPerf', '-d', sMountPoint1 + sGuestSlash + 'fstestdir-1', '-s8'];
+
+            # Skip part of mmap on older windows systems without CcCoherencyFlushAndPurgeCache (>= w7).
             reporter.log2('oTestVm.sGuestOsType=%s' % (oTestVm.sGuestOsType,));
-            if oTestVm.sGuestOsType in [ 'WindowsNT3x', 'WindowsNT4', 'Windows2000', 'WindowsXP', 'WindowsXP_64',
-                                         'Windows2003', 'Windows2003_64', 'WindowsVista', 'WindowsVista_64',
-                                         'Windows2008', 'Windows2008_64']:
-                asArgs.append('--no-mmap');
+            if   oTestVm.getNonCanonicalGuestOsType() \
+              in [ 'WindowsNT3x', 'WindowsNT4', 'Windows2000', 'WindowsXP', 'WindowsXP_64', 'Windows2003',
+                   'Windows2003_64', 'WindowsVista', 'WindowsVista_64', 'Windows2008', 'Windows2008_64']:
+                asArgs.append('--no-mmap-coherency');
 
             # Configure I/O block sizes according to guest memory size:
@@ -183 +192 @@
                 asArgs.append('--add-block-size=134217728'); # 128 MiB
 
+            asArgs.extend(self.asExtraArgs);
             reporter.log2('Starting guest FsPerf (%s)...' % (asArgs,));
             fRc = self.oTstDrv.txsRunTest(oTxsSession, 'FsPerf', 10 * 60 * 1000,