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

Side by Side Diff: tools/test.dart

Issue 10304018: lingering step 2 of the test rename overhaul: make await tests also a directory (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 7 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 | « frog/tests/await/while_normalization_test.dart ('k') | no next file » | 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 12 matching lines...) Expand all
23 * 23 *
24 */ 24 */
25 25
26 #library("test"); 26 #library("test");
27 27
28 #import("testing/dart/test_runner.dart"); 28 #import("testing/dart/test_runner.dart");
29 #import("testing/dart/test_options.dart"); 29 #import("testing/dart/test_options.dart");
30 #import("testing/dart/test_suite.dart"); 30 #import("testing/dart/test_suite.dart");
31 31
32 #import("../compiler/tests/dartc/test_config.dart"); 32 #import("../compiler/tests/dartc/test_config.dart");
33 #import("../frog/tests/await/test_config.dart");
34 #import("../runtime/tests/vm/test_config.dart"); 33 #import("../runtime/tests/vm/test_config.dart");
35 #import("../samples/tests/dartc/test_config.dart"); 34 #import("../samples/tests/dartc/test_config.dart");
36 #import("../tests/co19/test_config.dart"); 35 #import("../tests/co19/test_config.dart");
37 36
38 /** 37 /**
39 * The directories that contain test suites which follow the conventions 38 * The directories that contain test suites which follow the conventions
40 * required by [StandardTestSuite]'s forDirectory constructor. 39 * required by [StandardTestSuite]'s forDirectory constructor.
41 * New test suites should follow this convention because it makes it much 40 * New test suites should follow this convention because it makes it much
42 * simpler to add them to test.dart. Existing test suites should be 41 * simpler to add them to test.dart. Existing test suites should be
43 * moved to here, if possible. 42 * moved to here, if possible.
44 */ 43 */
45 final TEST_SUITE_DIRECTORIES = const [ 44 final TEST_SUITE_DIRECTORIES = const [
45 'frog/tests/await',
46 'frog/tests/frog', 46 'frog/tests/frog',
47 'frog/tests/frog_native', 47 'frog/tests/frog_native',
48 'frog/tests/leg', 48 'frog/tests/leg',
49 'frog/tests/leg_only', 49 'frog/tests/leg_only',
50 'runtime/tests/vm', 50 'runtime/tests/vm',
51 'samples/tests/samples', 51 'samples/tests/samples',
52 'tests/benchmark_smoke', 52 'tests/benchmark_smoke',
53 'tests/corelib', 53 'tests/corelib',
54 'tests/dom', 54 'tests/dom',
55 'tests/html', 55 'tests/html',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 for (String key in selectors.getKeys()) { 104 for (String key in selectors.getKeys()) {
105 if (key == 'co19') { 105 if (key == 'co19') {
106 queue.addTestSuite(new Co19TestSuite(conf)); 106 queue.addTestSuite(new Co19TestSuite(conf));
107 } else if (conf['runtime'] == 'vm' && key == 'vm') { 107 } else if (conf['runtime'] == 'vm' && key == 'vm') {
108 // vm tests contain both cc tests (added here) and dart tests (added in 108 // vm tests contain both cc tests (added here) and dart tests (added in
109 // [TEST_SUITE_DIRECTORIES]). 109 // [TEST_SUITE_DIRECTORIES]).
110 queue.addTestSuite(new VMTestSuite(conf)); 110 queue.addTestSuite(new VMTestSuite(conf));
111 } else if (conf['compiler'] == 'dartc' && key == 'dartc') { 111 } else if (conf['compiler'] == 'dartc' && key == 'dartc') {
112 queue.addTestSuite(new SamplesDartcTestSuite(conf)); 112 queue.addTestSuite(new SamplesDartcTestSuite(conf));
113 queue.addTestSuite(new JUnitDartcTestSuite(conf)); 113 queue.addTestSuite(new JUnitDartcTestSuite(conf));
114 } else if (key == 'await') {
115 queue.addTestSuite(new AwaitTestSuite(conf));
116 } 114 }
117 } 115 }
118 116
119 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { 117 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
120 final name = testSuiteDir.substring(testSuiteDir.lastIndexOf('/') + 1); 118 final name = testSuiteDir.substring(testSuiteDir.lastIndexOf('/') + 1);
121 if (selectors.containsKey(name)) { 119 if (selectors.containsKey(name)) {
122 queue.addTestSuite( 120 queue.addTestSuite(
123 new StandardTestSuite.forDirectory(conf, testSuiteDir)); 121 new StandardTestSuite.forDirectory(conf, testSuiteDir));
124 } 122 }
125 } 123 }
126 124
127 return true; 125 return true;
128 } 126 }
129 127
130 // Start process queue. 128 // Start process queue.
131 var queue = new ProcessQueue(maxProcesses, 129 var queue = new ProcessQueue(maxProcesses,
132 progressIndicator, 130 progressIndicator,
133 startTime, 131 startTime,
134 printTiming, 132 printTiming,
135 enqueueConfiguration, 133 enqueueConfiguration,
136 verbose, 134 verbose,
137 listTests, 135 listTests,
138 keepGeneratedTests); 136 keepGeneratedTests);
139 } 137 }
OLDNEW
« no previous file with comments | « frog/tests/await/while_normalization_test.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698