Chromium Code Reviews| Index: utils/testrunner/run_pipeline.dart |
| =================================================================== |
| --- utils/testrunner/run_pipeline.dart (revision 13269) |
| +++ utils/testrunner/run_pipeline.dart (working copy) |
| @@ -3,10 +3,10 @@ |
| // BSD-style license that can be found in the LICENSE file. |
| /** The default pipeline code for running a test file. */ |
| -#library('pipeline'); |
| -#import('dart:isolate'); |
| -#import('dart:io'); |
| -#source('pipeline_utils.dart'); |
| +library pipeline; |
| +import 'dart:isolate'; |
| +import 'dart:io'; |
| +part 'pipeline_utils.dart'; |
|
Siggi Cherem (dart-lang)
2012/10/05 00:39:53
not sure if it works yet, but if it does, please a
gram
2012/10/05 21:27:41
If works in vm and Dartium but not dart2js.
|
| /** |
| * The configuration passed in to the pipeline runner; this essentially |
| @@ -78,10 +78,10 @@ |
| if (config["layout"]) { |
| directives = ''' |
| - #import('dart:uri'); |
| - #import('dart:io'); |
| - #import('dart:math'); |
| - #source('${config["runnerDir"]}/layout_test_controller.dart'); |
| + import 'dart:uri'; |
| + import 'dart:io'; |
| + import 'dart:math'; |
| + part '${config["runnerDir"]}/layout_test_controller.dart'; |
| '''; |
| extras = ''' |
| sourceDir = '${config["expectedDirectory"]}'; |
| @@ -91,11 +91,11 @@ |
| '''; |
| } else if (config["runtime"] == "vm") { |
| directives = ''' |
| - #import('dart:io'); |
| - #import('dart:isolate'); |
| - #import('${config["unittest"]}', prefix:'unittest'); |
| - #import('${config["testfile"]}', prefix: 'test'); |
| - #source('${config["runnerDir"]}/standard_test_runner.dart'); |
| + import 'dart:io'; |
| + import 'dart:isolate'; |
| + import '${config["unittest"]}' as unittest; |
| + import '${config["testfile"]}' as test; |
| + part '${config["runnerDir"]}/standard_test_runner.dart'; |
| '''; |
| extras = ''' |
| includeFilters = ${config["include"]}; |
| @@ -105,11 +105,11 @@ |
| '''; |
| } else { |
| directives = ''' |
| - #import('dart:html'); |
| - #import('dart:isolate'); |
| - #import('${config["unittest"]}', prefix:'unittest'); |
| - #import('${config["testfile"]}', prefix: 'test'); |
| - #source('${config["runnerDir"]}/standard_test_runner.dart'); |
| + import 'dart:html'; |
| + import 'dart:isolate'; |
| + import '${config["unittest"]}' as unittest; |
| + import '${config["testfile"]}' as test; |
| + part '${config["runnerDir"]}/standard_test_runner.dart'; |
| '''; |
| extras = ''' |
| includeFilters = ${config["include"]}; |
| @@ -134,7 +134,7 @@ |
| logMessage('Creating $tempDartFile'); |
| writeFile(tempDartFile, ''' |
| - #library('test_controller'); |
| + library test_controller; |
| $directives |
| main() { |
| @@ -157,14 +157,14 @@ |
| if (config["layout"]) { |
| logMessage('Creating $tempChildDartFile'); |
| writeFile(tempChildDartFile, ''' |
| - #library('layout_test'); |
| - #import('dart:math'); |
| - #import('dart:isolate'); |
| - #import('dart:html'); |
| - #import('dart:uri'); |
| - #import('${config["unittest"]}', prefix:'unittest'); |
| - #import('$testFile', prefix: 'test'); |
| - #source('${config["runnerDir"]}/layout_test_runner.dart'); |
| + library layout_test; |
| + import 'dart:math'; |
| + import 'dart:isolate'; |
| + import 'dart:html'; |
| + import 'dart:uri'; |
| + import '${config["unittest"]}' as 'unittest' ; |
| + import '$testFile', prefix: 'test' ; |
| + part '${config["runnerDir"]}/layout_test_runner.dart'; |
| main() { |
| includeFilters = ${config["include"]}; |