| Index: tests/compiler/dart2js/dart2js_batch_test.dart
|
| diff --git a/tests/compiler/dart2js/dart2js_batch_test.dart b/tests/compiler/dart2js/dart2js_batch_test.dart
|
| index 55f8ca77390da5e16203f43f724d12e6b745d6c6..1d41bf0d4010a2d8896515b80f7d61c200ac0a73 100644
|
| --- a/tests/compiler/dart2js/dart2js_batch_test.dart
|
| +++ b/tests/compiler/dart2js/dart2js_batch_test.dart
|
| @@ -16,8 +16,8 @@ var tmpDir;
|
|
|
| copyDirectory(Directory sourceDir, Directory destinationDir) {
|
| sourceDir.listSync().forEach((FileSystemEntity element) {
|
| - String newPath = path.join(destinationDir.path,
|
| - path.basename(element.path));
|
| + String newPath =
|
| + path.join(destinationDir.path, path.basename(element.path));
|
| if (element is File) {
|
| element.copySync(newPath);
|
| } else if (element is Directory) {
|
| @@ -72,26 +72,22 @@ Future runTests(Process process) {
|
| process.stdin.close();
|
| Future<String> output = process.stdout.transform(UTF8.decoder).join();
|
| Future<String> errorOut = process.stderr.transform(UTF8.decoder).join();
|
| - return Future.wait([output, errorOut])
|
| - .then((result) {
|
| - String stdoutOutput = result[0];
|
| - String stderrOutput = result[1];
|
| + return Future.wait([output, errorOut]).then((result) {
|
| + String stdoutOutput = result[0];
|
| + String stderrOutput = result[1];
|
|
|
| - Expect.equals(4, ">>> EOF STDERR".allMatches(stderrOutput).length);
|
| - Expect.equals(4, ">>>".allMatches(stderrOutput).length);
|
| + Expect.equals(4, ">>> EOF STDERR".allMatches(stderrOutput).length);
|
| + Expect.equals(4, ">>>".allMatches(stderrOutput).length);
|
|
|
| - Expect.equals(2, ">>> TEST OK".allMatches(stdoutOutput).length);
|
| - Expect.equals(2, ">>> TEST FAIL".allMatches(stdoutOutput).length);
|
| - Expect.equals(4, ">>>".allMatches(stdoutOutput).length);
|
| - });
|
| + Expect.equals(2, ">>> TEST OK".allMatches(stdoutOutput).length);
|
| + Expect.equals(2, ">>> TEST FAIL".allMatches(stdoutOutput).length);
|
| + Expect.equals(4, ">>>".allMatches(stdoutOutput).length);
|
| + });
|
| }
|
|
|
| void main() {
|
| var tmpDir;
|
| asyncTest(() {
|
| - return setup()
|
| - .then(launchDart2Js)
|
| - .then(runTests)
|
| - .whenComplete(cleanUp);
|
| + return setup().then(launchDart2Js).then(runTests).whenComplete(cleanUp);
|
| });
|
| }
|
|
|