Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Side by Side Diff: tools/test.dart

Issue 12087086: Revert revision 17848 - this is breaking dartium testing (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | tools/test-runtime.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 TestingServerRunner.setBuildDir(firstConf);
130 TestingServerRunner.setPackageRootDir(firstConf);
131 var maxBrowserProcesses = maxProcesses; 129 var maxBrowserProcesses = maxProcesses;
132 for (var conf in configurations) { 130 for (var conf in configurations) {
133 // There should not be more than one InternetExplorerDriver instance 131 // There should not be more than one InternetExplorerDriver instance
134 // running at a time. For details, see 132 // running at a time. For details, see
135 // http://code.google.com/p/selenium/wiki/InternetExplorerDriver. 133 // http://code.google.com/p/selenium/wiki/InternetExplorerDriver.
136 if (conf['runtime'].startsWith('ie')) { 134 if (conf['runtime'].startsWith('ie')) {
137 maxBrowserProcesses = 1; 135 maxBrowserProcesses = 1;
138 } 136 }
137 TestingServerRunner.setPackageRootDir(conf);
139 for (String key in selectors.keys) { 138 for (String key in selectors.keys) {
140 if (key == 'co19') { 139 if (key == 'co19') {
141 testSuites.add(new Co19TestSuite(conf)); 140 testSuites.add(new Co19TestSuite(conf));
142 } else if (conf['runtime'] == 'vm' && key == 'vm') { 141 } else if (conf['runtime'] == 'vm' && key == 'vm') {
143 // vm tests contain both cc tests (added here) and dart tests (added in 142 // vm tests contain both cc tests (added here) and dart tests (added in
144 // [TEST_SUITE_DIRECTORIES]). 143 // [TEST_SUITE_DIRECTORIES]).
145 testSuites.add(new VMTestSuite(conf)); 144 testSuites.add(new VMTestSuite(conf));
146 } else if (conf['compiler'] == 'dartc' && key == 'dartc') { 145 } else if (conf['compiler'] == 'dartc' && key == 'dartc') {
147 testSuites.add(new SamplesDartcTestSuite(conf)); 146 testSuites.add(new SamplesDartcTestSuite(conf));
148 testSuites.add(new JUnitDartcTestSuite(conf)); 147 testSuites.add(new JUnitDartcTestSuite(conf));
(...skipping 19 matching lines...) Expand all
168 new ProcessQueue(maxProcesses, 167 new ProcessQueue(maxProcesses,
169 maxBrowserProcesses, 168 maxBrowserProcesses,
170 progressIndicator, 169 progressIndicator,
171 startTime, 170 startTime,
172 printTiming, 171 printTiming,
173 testSuites, 172 testSuites,
174 allTestsFinished, 173 allTestsFinished,
175 verbose, 174 verbose,
176 listTests); 175 listTests);
177 } 176 }
OLDNEW
« no previous file with comments | « no previous file | tools/test-runtime.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698