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

Unified Diff: dart/tools/testing/dart/test_suite.dart

Issue 143453012: Added tools/status_clean.dart script (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dart/tools/testing/dart/test_progress.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/tools/testing/dart/test_suite.dart
diff --git a/dart/tools/testing/dart/test_suite.dart b/dart/tools/testing/dart/test_suite.dart
index 4c2cfbc314b31defe60228fac1bf7c73263b7c7b..d9cfa71c9d67e050c999eefde83e6f80b9f80397 100644
--- a/dart/tools/testing/dart/test_suite.dart
+++ b/dart/tools/testing/dart/test_suite.dart
@@ -26,6 +26,10 @@ import "http_server.dart" show PREFIX_BUILDDIR, PREFIX_DARTDIR;
part "browser_test.dart";
+RegExp multiHtmlTestGroupRegExp = new RegExp(r"\s*[^/]\s*group\('[^,']*");
+RegExp multiHtmlTestRegExp = new RegExp(r"useHtmlIndividualConfiguration()");
+RegExp multiTestRegExp = new RegExp(r"/// [0-9][0-9]:(.*)");
+
/**
* A simple function that tests [arg] and returns `true` or `false`.
*/
@@ -635,8 +639,6 @@ class StandardTestSuite extends TestSuite {
final bool listRecursively;
final extraVmOptions;
- static final RegExp multiTestRegExp = new RegExp(r"/// [0-9][0-9]:(.*)");
-
StandardTestSuite(Map configuration,
String suiteName,
Path suiteDirectory,
@@ -1606,8 +1608,6 @@ class StandardTestSuite extends TestSuite {
RegExp dartOptionsRegExp = new RegExp(r"// DartOptions=(.*)");
RegExp otherScriptsRegExp = new RegExp(r"// OtherScripts=(.*)");
RegExp packageRootRegExp = new RegExp(r"// PackageRoot=(.*)");
- RegExp multiHtmlTestRegExp =
- new RegExp(r"useHtmlIndividualConfiguration()");
RegExp isolateStubsRegExp = new RegExp(r"// IsolateStubs=(.*)");
// TODO(gram) Clean these up once the old directives are not supported.
RegExp domImportRegExp =
@@ -1673,15 +1673,9 @@ class StandardTestSuite extends TestSuite {
String isolateStubs = isolateMatch != null ? isolateMatch[1] : '';
bool containsDomImport = domImportRegExp.hasMatch(contents);
- // Note: This is brittle. It's the age-old problem of having a context free
- // language but the means to easily identify the construct is a regular
- // expression, aka impossible. Therefore we just make an approximation of
- // the number of top-level "group(...)" occurrences. This assumes you import
- // unittest with no prefix and always directly call "group(". It only uses
- // top-level "groups" so tests running nested groups will be no-ops.
- RegExp numTests = new RegExp(r"\s*[^/]\s*group\('[^,']*");
List<String> subtestNames = [];
- Iterator matchesIter = numTests.allMatches(contents).iterator;
+ Iterator matchesIter =
+ multiHtmlTestGroupRegExp.allMatches(contents).iterator;
while(matchesIter.moveNext() && isMultiHtmlTest) {
String fullMatch = matchesIter.current.group(0);
subtestNames.add(fullMatch.substring(fullMatch.indexOf("'") + 1));
« no previous file with comments | « dart/tools/testing/dart/test_progress.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698