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

Timestamp:

May 23, 2019 1:24:51 AM (6 years ago)

Author:

vboxsync

Message:

tdAddSharedFolders1.py: Reduced the --many-files value so we don't waste time testing the host file system handling of big directories. Also, dropped one of the 'FsPerf' test levels (was three, now only two). bugref:9172

File:

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

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

@@ -157 +157 @@
         # Run FsPerf inside the guest.
         #
-        reporter.testStart('FsPerf');
         fSkip = 'fsperf' not in self.asTests;
         if fSkip is False:
@@ -193 +192 @@
                 asArgs.append('--add-block-size=134217728'); # 128 MiB
 
+            # Putting lots (10000) of files in a single directory causes issues on OS X
+            # (HFS+ presumably, though could be slow disks) and some linuxes (slow disks,
+            # maybe ext2/3?).  So, generally reduce the file count to 4096 everywhere
+            # since we're not here to test the host file systems, and 3072 on macs.
+            if utils.getHostOs() in [ 'darwin', ]:
+                asArgs.append('--many-files=3072');
+            elif utils.getHostOs() in [ 'linux', ]:
+                asArgs.append('--many-files=4096');
+
+            # Add the extra arguments from the command line and kick it off:
             asArgs.extend(self.asExtraArgs);
             reporter.log2('Starting guest FsPerf (%s)...' % (asArgs,));
@@ -204 +213 @@
                 try:    shutil.rmtree(sTestDir);
                 except: fRc = reporter.errorXcpt('shutil.rmtree(%s)' % (sTestDir,));
-
-        reporter.testDone(fSkip or fRc is None);
-
+        else:
+            reporter.testStart('FsPerf');
+            reporter.testDone(fSkip or fRc is None);
 
         return (fRc, oTxsSession);