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

Unified Diff: utils/testrunner/testrunner.dart

Issue 10966020: Added support for running an HTTP server during the test and being able to serve up static files. L… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 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: utils/testrunner/testrunner.dart
===================================================================
--- utils/testrunner/testrunner.dart (revision 12655)
+++ utils/testrunner/testrunner.dart (working copy)
@@ -71,12 +71,11 @@
#import('dart:math');
#import('../../pkg/args/lib/args.dart');
+#source('client_server_task.dart');
#source('configuration.dart');
-#source('dart_task.dart');
#source('dart_wrap_task.dart');
#source('dart2js_task.dart');
#source('delete_task.dart');
-#source('drt_task.dart');
#source('html_wrap_task.dart');
#source('macros.dart');
#source('options.dart');
@@ -174,15 +173,26 @@
}
// Add the execution step.
+ var command;
+ var flags;
+ var task;
if (runtime == 'vm' || config.layoutPixel || config.layoutText) {
+ command = config.dartPath;
if (checkedMode) {
- pipeline.add(new DartTask.checked(tempDartFile));
+ flags = ['--enable_asserts', '--enable_type_checks', tempDartFile];
} else {
- pipeline.add(new DartTask(tempDartFile));
+ flags = [tempDartFile];
}
} else {
- pipeline.add(new DrtTask(Macros.fullFilePath, tempHTMLFile));
+ command = config.drtPath;
+ flags = ['--no-timeout', tempHTMLFile];
}
+ if (config.runServer) {
+ task = new RunClientServerTask(command, flags, config.timeout);
+ } else {
+ task = new RunProcessTask(command, flags, config.timeout);
+ }
+ pipeline.add(task);
return pipeline;
}
« utils/testrunner/http_server_test_runner.dart ('K') | « utils/testrunner/run_process_task.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698