1 files changed, 0 insertions, 26 deletions
diff --git a/Tools/Scripts/run-webkit-tests b/Tools/Scripts/run-webkit-tests
index 4bb8f3944..fd507e49a 100755
--- a/Tools/Scripts/run-webkit-tests
+++ b/Tools/Scripts/run-webkit-tests
@@ -57,28 +57,12 @@ sub runningOnBuildBot()
 
 sub useNewRunWebKitTests()
 {
-    # NRWT Windows support still needs work: https://bugs.webkit.org/show_bug.cgi?id=38756
-    return 0 if (isWindows() or isCygwin()) and !isChromium();
     # NRWT does not support qt-arm: https://bugs.webkit.org/show_bug.cgi?id=64086
     return 0 if isQt() and isARM();
     # All other platforms should use NRWT by default.
     return 1;
 }
 
-sub platformIsReadyForParallelTesting()
-{
-    # NRWT is able to run the tests in parallel, ORWT was not.
-    # When we run the tests in parallel, tests which (incorrectly)
-    # interact with each other can start failing.
-    # To reduce the failure burden during the transition individual
-    # platforms can opt-in to parallel test execution by default.
-
-    # We believe all platforms are ready for default parallel testing except
-    # Qt, as Qt runs more than one build-slave per-server.
-    # Ossy has asked me to blacklist Qt for now.
-    return !isQt();
-}
-
 my $script = "perl";
 my $harnessName = "old-run-webkit-tests";
 
@@ -86,12 +70,6 @@ if (useNewRunWebKitTests()) {
     $script = "python";
     $harnessName = "new-run-webkit-tests";
 
-    if (!grep(/--child-processes/, @ARGV) and !platformIsReadyForParallelTesting()) {
-        push(@ARGV, "--child-processes=1");
-        print "Running new-run-webkit-tests with one child process.\n";
-        print "For more parallelism, run new-run-webkit-tests directly.\n";
-    }
-
     if (runningOnBuildBot()) {
         push(@ARGV, "--debug-rwt-logging");
     }
@@ -112,10 +90,6 @@ if (isQt()) {
     push(@ARGV, "--gtk");
 } elsif (isEfl()) {
     push(@ARGV, "--efl");
-} elsif (isChromiumAndroid()) {
-    push(@ARGV, "--chromium-android");
-} elsif (isChromium()) {
-    push(@ARGV, "--chromium");
 } elsif (isWinCairo()) {
     push(@ARGV, "--wincairo");
 }