Chromium Code Reviews| 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 // TODO(ager): Get rid of this version of test.dart when we don't have | 6 // TODO(ager): Get rid of this version of test.dart when we don't have |
| 7 // to worry about the special runtime checkout anymore. | 7 // to worry about the special runtime checkout anymore. |
| 8 // This file is identical to test.dart with test suites in the | 8 // This file is identical to test.dart with test suites in the |
| 9 // directories samples, client, compiler, frog, and utils removed. | 9 // directories samples, client, compiler, frog, and utils removed. |
| 10 | 10 |
| 11 #library("test"); | 11 #library("test"); |
| 12 | 12 |
| 13 #import("dart:io"); | |
| 13 #import("testing/dart/test_runner.dart"); | 14 #import("testing/dart/test_runner.dart"); |
| 14 #import("testing/dart/test_options.dart"); | 15 #import("testing/dart/test_options.dart"); |
| 15 #import("testing/dart/test_suite.dart"); | 16 #import("testing/dart/test_suite.dart"); |
| 16 | 17 |
| 17 #import("../tests/co19/test_config.dart"); | 18 #import("../tests/co19/test_config.dart"); |
| 18 #import("../runtime/tests/vm/test_config.dart"); | 19 #import("../runtime/tests/vm/test_config.dart"); |
| 19 | 20 |
| 20 /** | 21 /** |
| 21 * The directories that contain test suites which follow the conventions | 22 * The directories that contain test suites which follow the conventions |
| 22 * required by [StandardTestSuite]'s forDirectory constructor. | 23 * required by [StandardTestSuite]'s forDirectory constructor. |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 73 var conf = configurationIterator.next(); | 74 var conf = configurationIterator.next(); |
| 74 if (selectors.containsKey('co19')) { | 75 if (selectors.containsKey('co19')) { |
| 75 queue.addTestSuite(new Co19TestSuite(conf)); | 76 queue.addTestSuite(new Co19TestSuite(conf)); |
| 76 } | 77 } |
| 77 if (conf['runtime'] == 'vm' && selectors.containsKey('vm')) { | 78 if (conf['runtime'] == 'vm' && selectors.containsKey('vm')) { |
| 78 // vm tests contain both cc tests (added here) and dart tests (added in | 79 // vm tests contain both cc tests (added here) and dart tests (added in |
| 79 // [TEST_SUITE_DIRECTORIES]). | 80 // [TEST_SUITE_DIRECTORIES]). |
| 80 queue.addTestSuite(new VMTestSuite(conf)); | 81 queue.addTestSuite(new VMTestSuite(conf)); |
| 81 } | 82 } |
| 82 | 83 |
| 83 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { | 84 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { |
|
Anton Muhin
2012/06/26 13:22:18
should TEST_SUITE_DIRECTORIES be a list of Paths n
Bill Hesse
2012/06/27 09:35:03
It is just a pain to write a list of paths instead
| |
| 84 final name = testSuiteDir.substring(testSuiteDir.lastIndexOf('/') + 1); | 85 Path testSuitePath = new Path(testSuiteDir); |
| 86 final name = testSuitePath.filename; | |
|
Anton Muhin
2012/06/26 13:22:18
nit: that reads slightly weird: it's rather dir na
| |
| 85 if (selectors.containsKey(name)) { | 87 if (selectors.containsKey(name)) { |
| 86 queue.addTestSuite( | 88 queue.addTestSuite( |
| 87 new StandardTestSuite.forDirectory(conf, testSuiteDir)); | 89 new StandardTestSuite.forDirectory(conf, testSuitePath)); |
| 88 } | 90 } |
| 89 } | 91 } |
| 90 | 92 |
| 91 return true; | 93 return true; |
| 92 } | 94 } |
| 93 | 95 |
| 94 // Start process queue. | 96 // Start process queue. |
| 95 var queue = new ProcessQueue(maxProcesses, | 97 var queue = new ProcessQueue(maxProcesses, |
| 96 progressIndicator, | 98 progressIndicator, |
| 97 startTime, | 99 startTime, |
| 98 printTiming, | 100 printTiming, |
| 99 enqueueConfiguration, | 101 enqueueConfiguration, |
| 100 verbose, | 102 verbose, |
| 101 listTests); | 103 listTests); |
| 102 } | 104 } |
| OLD | NEW |