utils/testrunner/run_pipeline.dart - Issue 11033042: Change imports etc to new syntax.

Unified Diff: utils/testrunner/run_pipeline.dart

Issue 11033042: Change imports etc to new syntax. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 8 years, 2 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

« utils/testrunner/layout_test_runner.dart ('K') | « utils/testrunner/pipeline_utils.dart ('k') | utils/testrunner/standard_test_runner.dart » ('j') | utils/testrunner/standard_test_runner.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: utils/testrunner/run_pipeline.dart

===================================================================

--- utils/testrunner/run_pipeline.dart (revision 13306)

+++ 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';

/**

* 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"]};

@@ -193,7 +193,7 @@

scriptType = isJavascript ? 'text/javascript' : 'application/dart';

if (config["runtime"] == 'drt-dart' || isJavascript) {

- logMessage('Creating $tempHtmlFile');

+ logMessage('Creating $tempHtmlFile');

writeFile(tempHtmlFile, '''

<!DOCTYPE html>

<html>

@@ -283,7 +283,7 @@

stopProcess(serverId);

}

- if (!config["keep_files"]) { // Remove the temporary files.

+ if (!config["keep-files"]) { // Remove the temporary files.

cleanup(tempDartFile);

cleanup(tempHtmlFile);

cleanup(tempJsFile);