Revert revision 13230

tools/testing/dart/test_options.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library("test_options_parser");
 
 #import("dart:io");
 #import("dart:math");
 #import("drt_updater.dart");
 #import("test_suite.dart");
@@ skipping 70 matching lines @@
               ['-c', '--compiler'],
               ['none', 'dart2dart', 'dart2js', 'dartc'],
               'none'),
           new _TestOptionSpecification(
               'runtime',
               '''Where the tests should be run.
     vm: Run Dart code on the standalone dart vm.
 
     d8: Run JavaScript from the command line using v8.
 
-    jsshell: Run JavaScript from the command line using firefox js-shell.
-
     drt: Run Dart or JavaScript in the headless version of Chrome,
          DumpRenderTree.
 
     dartium: Run Dart or JavaScript in Dartium.
 
     [ff | chrome | safari | ie | opera]: Run JavaScript in the specified
          browser.
 
     none: No runtime, compile only (for example, used for dartc static analysis
           tests).''',
               ['-r', '--runtime'],
-              ['vm', 'd8', 'jsshell', 'drt', 'dartium', 'ff', 'firefox',
-               'chrome', 'safari', 'ie', 'opera', 'none'],
+              ['vm', 'd8', 'drt', 'dartium', 'ff', 'firefox', 'chrome',
+              'safari', 'ie', 'opera', 'none'],
               'vm'),
           new _TestOptionSpecification(
               'arch',
               'The architecture to run tests for',
               ['-a', '--arch'],
               ['all', 'ia32', 'x64', 'simarm'],
               'ia32'),
           new _TestOptionSpecification(
               'system',
               'The operating system to run tests on',
@@ skipping 274 matching lines @@
    */
   bool _isValidConfig(Map config) {
     bool isValid = true;
     List<String> validRuntimes;
     switch (config['compiler']) {
       case 'dart2js':
         // Note: by adding 'none' as a configuration, if the user
         // runs test.py -c dart2js -r drt,none the dart2js_none and
         // dart2js_drt will be duplicating work. If later we don't need 'none'
         // with dart2js, we should remove it from here.
-        validRuntimes = const ['d8', 'jsshell', 'drt', 'none', 'dartium',
+        validRuntimes = const ['d8', 'drt', 'none', 'dartium',
                                'ff', 'chrome', 'safari', 'ie', 'opera'];
         break;
       case 'dartc':
         validRuntimes = const ['none'];
         break;
       case 'none':
       case 'dart2dart':
         validRuntimes = const ['vm', 'drt', 'dartium'];
         break;
     }
@@ skipping 57 matching lines @@
     // Create the artificial 'unchecked' options that test status files
     // expect.
     configuration['unchecked'] = !configuration['checked'];
     configuration['host_unchecked'] = !configuration['host_checked'];
 
     String runtime = configuration['runtime'];
     if (runtime == 'firefox') {
       configuration['runtime'] == 'ff';
     }
 
-    configuration['browser'] = TestUtils.isBrowserRuntime(runtime);
-
-    // Set the javascript command line flag for less verbose status files.
-    configuration['jscl'] = TestUtils.isJsCommandLineRuntime(runtime);
+    if (TestUtils.isBrowserRuntime(runtime)) {
+      configuration['browser'] = true;
+    }
 
     // Expand the test selectors into a suite name and a simple
     // regular expressions to be used on the full path of a test file
     // in that test suite. If no selectors are explicitly given use
     // the default suite patterns.
     var selectors = configuration['selectors'];
     if (selectors is !Map) {
       if (selectors == null) {
         selectors = new List.from(defaultTestSelectors);
       }
@@ skipping 153 matching lines @@
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
   }
 
 
   List<_TestOptionSpecification> _options;
 }