SERVER-519 adding test

1 files changed, 13 insertions, 8 deletions

diff --git a/jstests/parallel/basic.js b/jstests/parallel/basic.js
index f35c3a359de..8140d826679 100644
--- a/jstests/parallel/basic.js
+++ b/jstests/parallel/basic.js
@@ -2,31 +2,36 @@
 
 var files = listFiles("jstests");
 var i = 0;
-var argvs = new Array( [], [], [], [] );
+var argvs = new Array( [{0:[]}], [{1:[]}], [{2:[]}], [{3:[]}] );
+
+// some tests can't run in parallel with others
+var skipTests = { "jstests/dbadmin.js":1 };
 
 files.forEach(
               function(x) {
               
               if ( /_runner/.test(x.name) ||
                   /_lodeRunner/.test(x.name) ||
+                  ( x.name in skipTests ) ||
                   ! /\.js$/.test(x.name ) ){ 
               print(" >>>>>>>>>>>>>>> skipping " + x.name);
               return;
               }
-
-              argvs[ i++ % 4 ].push( x.name );
+              
+              argvs[ i % 4 ][0][ i % 4 ].push( x.name );
+              ++i;
               }
 );
 
-printjson( argvs );
-
 test = function() {
-    var args = argumentsToArray( arguments );
+    var args = argumentsToArray( arguments )[ 0 ];
+    var suite = Object.keySet( args )[ 0 ];
+    var args = args[ suite ];
     args.forEach(
                   function( x ) {
-                  print("         Test : " + x + " ...");
+                  print("         S" + suite + " Test : " + x + " ...");
                   var time = Date.timeFunc( function() { load(x); }, 1);
-                  print("         Test : " + x + " " + time + "ms" );
+                  print("         S" + suite + " Test : " + x + " " + time + "ms" );
                   }
                   );
 }