| OLD | NEW | 
|---|
| 1 #!/usr/bin/env dart | 1 #!/usr/bin/env dart | 
| 2 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file | 2 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file | 
| 3 // for details. All rights reserved. Use of this source code is governed by a | 3 // for details. All rights reserved. Use of this source code is governed by a | 
| 4 // BSD-style license that can be found in the LICENSE file. | 4 // BSD-style license that can be found in the LICENSE file. | 
| 5 | 5 | 
| 6 /** | 6 /** | 
| 7  * This file is the entrypoint of the dart test suite.  This suite is used | 7  * This file is the entrypoint of the dart test suite.  This suite is used | 
| 8  * to test: | 8  * to test: | 
| 9  * | 9  * | 
| 10  *     1. the dart vm | 10  *     1. the dart vm | 
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 119     }); | 119     }); | 
| 120     if (runningBrowserTests) { | 120     if (runningBrowserTests) { | 
| 121       TestingServerRunner.startHttpServer('127.0.0.1'); | 121       TestingServerRunner.startHttpServer('127.0.0.1'); | 
| 122       // We start two servers so that we can test cross-domain tests. | 122       // We start two servers so that we can test cross-domain tests. | 
| 123       TestingServerRunner.startHttpServer('127.0.0.1', | 123       TestingServerRunner.startHttpServer('127.0.0.1', | 
| 124           allowedPort: TestingServerRunner.serverList[0].port); | 124           allowedPort: TestingServerRunner.serverList[0].port); | 
| 125     } | 125     } | 
| 126   } | 126   } | 
| 127 | 127 | 
| 128   var testSuites = new List<TestSuite>(); | 128   var testSuites = new List<TestSuite>(); | 
|  | 129   // FIXME(kustermann,ricow): This is broken and should be fixed ASAP. | 
|  | 130   // Issue: 8366 | 
|  | 131   TestingServerRunner.setBuildDir(firstConf); | 
|  | 132   TestingServerRunner.setPackageRootDir(firstConf); | 
| 129   var maxBrowserProcesses = maxProcesses; | 133   var maxBrowserProcesses = maxProcesses; | 
| 130   for (var conf in configurations) { | 134   for (var conf in configurations) { | 
| 131     // There should not be more than one InternetExplorerDriver instance | 135     // There should not be more than one InternetExplorerDriver instance | 
| 132     // running at a time. For details, see | 136     // running at a time. For details, see | 
| 133     // http://code.google.com/p/selenium/wiki/InternetExplorerDriver. | 137     // http://code.google.com/p/selenium/wiki/InternetExplorerDriver. | 
| 134     if (conf['runtime'].startsWith('ie')) { | 138     if (conf['runtime'].startsWith('ie')) { | 
| 135       maxBrowserProcesses = 1; | 139       maxBrowserProcesses = 1; | 
| 136     } | 140     } | 
| 137     TestingServerRunner.setPackageRootDir(conf); |  | 
| 138     for (String key in selectors.keys) { | 141     for (String key in selectors.keys) { | 
| 139       if (key == 'co19') { | 142       if (key == 'co19') { | 
| 140         testSuites.add(new Co19TestSuite(conf)); | 143         testSuites.add(new Co19TestSuite(conf)); | 
| 141       } else if (conf['runtime'] == 'vm' && key == 'vm') { | 144       } else if (conf['runtime'] == 'vm' && key == 'vm') { | 
| 142         // vm tests contain both cc tests (added here) and dart tests (added in | 145         // vm tests contain both cc tests (added here) and dart tests (added in | 
| 143         // [TEST_SUITE_DIRECTORIES]). | 146         // [TEST_SUITE_DIRECTORIES]). | 
| 144         testSuites.add(new VMTestSuite(conf)); | 147         testSuites.add(new VMTestSuite(conf)); | 
| 145       } else if (conf['compiler'] == 'dartc' && key == 'dartc') { | 148       } else if (conf['compiler'] == 'dartc' && key == 'dartc') { | 
| 146         testSuites.add(new SamplesDartcTestSuite(conf)); | 149         testSuites.add(new SamplesDartcTestSuite(conf)); | 
| 147         testSuites.add(new JUnitDartcTestSuite(conf)); | 150         testSuites.add(new JUnitDartcTestSuite(conf)); | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 167   new ProcessQueue(maxProcesses, | 170   new ProcessQueue(maxProcesses, | 
| 168                    maxBrowserProcesses, | 171                    maxBrowserProcesses, | 
| 169                    progressIndicator, | 172                    progressIndicator, | 
| 170                    startTime, | 173                    startTime, | 
| 171                    printTiming, | 174                    printTiming, | 
| 172                    testSuites, | 175                    testSuites, | 
| 173                    allTestsFinished, | 176                    allTestsFinished, | 
| 174                    verbose, | 177                    verbose, | 
| 175                    listTests); | 178                    listTests); | 
| 176 } | 179 } | 
| OLD | NEW | 
|---|