Make test.dart respect the requested order of test suites, and also split up IE

tools/test.dart

Index: tools/test.dart
===================================================================
--- tools/test.dart	(revision 7030)
+++ tools/test.dart	(working copy)
@@ -97,64 +97,66 @@
     }
 
     var conf = configurationIterator.next();
-    if (selectors.containsKey('samples')) {
-      queue.addTestSuite(new SamplesTestSuite(conf));
-    }
-    if (selectors.containsKey('standalone')) {
-      queue.addTestSuite(new StandaloneTestSuite(conf));
-    }
-    if (selectors.containsKey('corelib')) {
-      queue.addTestSuite(new CorelibTestSuite(conf));
-    }
-    if (selectors.containsKey('co19')) {
-      queue.addTestSuite(new Co19TestSuite(conf));
-    }
-    if (selectors.containsKey('language')) {
-      queue.addTestSuite(new LanguageTestSuite(conf));
-    }
-    if (selectors.containsKey('lib')) {
-      queue.addTestSuite(new LibTestSuite(conf));
-    }
-    if (selectors.containsKey('isolate')) {
-      queue.addTestSuite(new IsolateTestSuite(conf));
-    }
-    if (selectors.containsKey('utils')) {
-      queue.addTestSuite(new UtilsTestSuite(conf));
-    }
-    if (conf['runtime'] == 'vm' && selectors.containsKey('vm')) {
-      queue.addTestSuite(new VMTestSuite(conf));
-      queue.addTestSuite(new VMDartTestSuite(conf));
-    }
-    if (selectors.containsKey('frog')) {
-      queue.addTestSuite(new FrogTestSuite(conf));
-    }
-    if (selectors.containsKey('leg')) {
-      queue.addTestSuite(new LegTestSuite(conf));
-    }
-    if (selectors.containsKey('leg_only')) {
-      queue.addTestSuite(new LegOnlyTestSuite(conf));
-    }
-    if (selectors.containsKey('frog_native')) {
-      queue.addTestSuite(new FrogNativeTestSuite(conf));
-    }
-    if (conf['compiler'] == 'dartc' && selectors.containsKey('dartc')) {
-      queue.addTestSuite(new ClientDartcTestSuite(conf));
-    }
-    if (conf['compiler'] == 'dartc' && selectors.containsKey('dartc')) {
-      queue.addTestSuite(new JUnitDartcTestSuite(conf));
-    }
-    if (selectors.containsKey('await')) {
-      queue.addTestSuite(new AwaitTestSuite(conf));
-    }
-    if (selectors.containsKey('client')) {
-      queue.addTestSuite(new ClientTestSuite(conf));
-    }
+    for (String key in selectors.getKeys()) {
+      if (key == 'samples') {
+        queue.addTestSuite(new SamplesTestSuite(conf));
+      }

[Siggi Cherem (dart-lang), 2012/04/26 17:46:53]

here you could use '} else if (...) {'

[Emily Fortuna, 2012/04/26 18:09:11]

Touché.

+      if (key == 'standalone') {
+        queue.addTestSuite(new StandaloneTestSuite(conf));
+      }
+      if (key == 'corelib') {
+        queue.addTestSuite(new CorelibTestSuite(conf));
+      }
+      if (key == 'co19') {
+        queue.addTestSuite(new Co19TestSuite(conf));
+      }
+      if (key == 'language') {
+        queue.addTestSuite(new LanguageTestSuite(conf));
+      }
+      if (key == 'lib') {
+        queue.addTestSuite(new LibTestSuite(conf));
+      }
+      if (key == 'isolate') {
+        queue.addTestSuite(new IsolateTestSuite(conf));
+      }
+      if (key == 'utils') {
+        queue.addTestSuite(new UtilsTestSuite(conf));
+      }
+      if (conf['runtime'] == 'vm' && key == 'vm') {
+        queue.addTestSuite(new VMTestSuite(conf));
+        queue.addTestSuite(new VMDartTestSuite(conf));
+      }
+      if (key == 'frog') {
+        queue.addTestSuite(new FrogTestSuite(conf));
+      }
+      if (key == 'leg') {
+        queue.addTestSuite(new LegTestSuite(conf));
+      }
+      if (key == 'leg_only') {
+        queue.addTestSuite(new LegOnlyTestSuite(conf));
+      }
+      if (key == 'frog_native') {
+        queue.addTestSuite(new FrogNativeTestSuite(conf));
+      }
+      if (conf['compiler'] == 'dartc' && key == 'dartc') {
+        queue.addTestSuite(new ClientDartcTestSuite(conf));
+      }
+      if (conf['compiler'] == 'dartc' && key == 'dartc') {
+        queue.addTestSuite(new JUnitDartcTestSuite(conf));
+      }
+      if (key == 'await') {
+        queue.addTestSuite(new AwaitTestSuite(conf));
+      }
+      if (key == 'client') {
+        queue.addTestSuite(new ClientTestSuite(conf));
+      }
 
-    for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
-      final name = testSuiteDir.substring(testSuiteDir.lastIndexOf('/') + 1);
-      if (selectors.containsKey(name)) {
-        queue.addTestSuite(
-            new StandardTestSuite.forDirectory(conf, testSuiteDir));
+      for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
+        final name = testSuiteDir.substring(testSuiteDir.lastIndexOf('/') + 1);
+        if (selectors.containsKey(name)) {
+          queue.addTestSuite(
+              new StandardTestSuite.forDirectory(conf, testSuiteDir));
+        }
       }
     }