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

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

Issue 9610002: remove node.js dependency by running the frog compiler in (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: fix frog html Created 8 years, 9 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
Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index fa255d56782b4bfa3b672eede1b8c32472a90389..bbd8026e7104bf2b33cbb0b765fada375dc53730 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -330,6 +330,7 @@ class StandardTestSuite implements TestSuite {
case 'dartium':
case 'chromium':
case 'frogium':
+ case 'frogsh':
case 'legium':
case 'webdriver':
enqueueBrowserTest(filename, testName, optionsFromFile,
@@ -584,6 +585,13 @@ class StandardTestSuite implements TestSuite {
args.add(inputFile);
// TODO(whesse): Add --fatal-type-errors if needed.
break;
+ case 'frogsh':
+ args.clear();
+ args.add('--out=$outputFile');
+ args.add('--frogpad_js=' +
+ '${TestUtils.buildDir(configuration)}/frog/bin/frogpad.js');
+ args.add(inputFile);
+ break;
case 'frogium':
case 'legium':
case 'webdriver':
@@ -671,16 +679,18 @@ class StandardTestSuite implements TestSuite {
}
String get scriptType() {
- switch (configuration['component']) {
+ String component = configuration['component'];
+ switch (component) {
case 'dartium':
return 'application/dart';
case 'chromium':
case 'frogium':
+ case 'frogsh':
case 'legium':
case 'webdriver':
return 'text/javascript';
default:
- Expect.fail('Unimplemented component scriptType');
+ Expect.fail("Unexpected component '$component'");
Bill Hesse 2012/03/08 10:34:27 Why not just write ${configuration['component']} h
mattsh 2012/03/08 16:31:42 Done.
return null;
}
}
@@ -1110,7 +1120,7 @@ class TestUtils {
throw "Unknown compiler for: ${configuration['component']}";
}
}
-
+
Bill Hesse 2012/03/08 10:34:27 Whitespace.
mattsh 2012/03/08 16:31:42 Done.
static String dartShellFileName(Map configuration) {
var name = '${buildDir(configuration)}/${executableName(configuration)}';
if (!(new File(name)).existsSync() && !configuration['list']) {
@@ -1124,7 +1134,10 @@ class TestUtils {
return null; // No separate compiler for dartium tests.
}
var name = configuration['frog'];
- if (name == '') {
+ if (configuration['component'] == 'frogsh') {
+ name = '${dartDir()}/tools/testing/frogpad/frogpad.py';
+ }
+ if (name == '') {
Bill Hesse 2012/03/08 10:34:27 Whitespace.
mattsh 2012/03/08 16:31:42 Done.
name = '${buildDir(configuration)}/${compilerName(configuration)}';
}
if (!(new File(name)).existsSync() && !configuration['list']) {

Powered by Google App Engine
This is Rietveld 408576698