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

Side by Side Diff: tools/test.dart

Issue 12225109: Revert "Change the location of the output directory" plus one other fix. (Closed) Base URL: https://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 // FIXME(kustermann,ricow): This is boken and should be fixed ASAP.
130 // Issue: 8366
131 TestingServerRunner.setBuildDir(firstConf);
132 TestingServerRunner.setPackageRootDir(firstConf);
133 var maxBrowserProcesses = maxProcesses; 129 var maxBrowserProcesses = maxProcesses;
134 for (var conf in configurations) { 130 for (var conf in configurations) {
135 // There should not be more than one InternetExplorerDriver instance 131 // There should not be more than one InternetExplorerDriver instance
136 // running at a time. For details, see 132 // running at a time. For details, see
137 // http://code.google.com/p/selenium/wiki/InternetExplorerDriver. 133 // http://code.google.com/p/selenium/wiki/InternetExplorerDriver.
138 if (conf['runtime'].startsWith('ie')) { 134 if (conf['runtime'].startsWith('ie')) {
139 maxBrowserProcesses = 1; 135 maxBrowserProcesses = 1;
140 } 136 }
137 TestingServerRunner.setPackageRootDir(conf);
141 for (String key in selectors.keys) { 138 for (String key in selectors.keys) {
142 if (key == 'co19') { 139 if (key == 'co19') {
143 testSuites.add(new Co19TestSuite(conf)); 140 testSuites.add(new Co19TestSuite(conf));
144 } else if (conf['runtime'] == 'vm' && key == 'vm') { 141 } else if (conf['runtime'] == 'vm' && key == 'vm') {
145 // 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
146 // [TEST_SUITE_DIRECTORIES]). 143 // [TEST_SUITE_DIRECTORIES]).
147 testSuites.add(new VMTestSuite(conf)); 144 testSuites.add(new VMTestSuite(conf));
148 } else if (conf['compiler'] == 'dartc' && key == 'dartc') { 145 } else if (conf['compiler'] == 'dartc' && key == 'dartc') {
149 testSuites.add(new SamplesDartcTestSuite(conf)); 146 testSuites.add(new SamplesDartcTestSuite(conf));
150 testSuites.add(new JUnitDartcTestSuite(conf)); 147 testSuites.add(new JUnitDartcTestSuite(conf));
(...skipping 19 matching lines...) Expand all
170 new ProcessQueue(maxProcesses, 167 new ProcessQueue(maxProcesses,
171 maxBrowserProcesses, 168 maxBrowserProcesses,
172 progressIndicator, 169 progressIndicator,
173 startTime, 170 startTime,
174 printTiming, 171 printTiming,
175 testSuites, 172 testSuites,
176 allTestsFinished, 173 allTestsFinished,
177 verbose, 174 verbose,
178 listTests); 175 listTests);
179 } 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