From 77142b82574b178c015c69f3368d8e773d4082ed Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Thu, 7 Mar 2019 22:18:15 -0800
Subject: [PATCH] Revert "re-enable dart2js test (#29010)" (#29030)

This reverts commit 6a7f231d89156272a5317141f1cde64fae93c9b4.
---
 dev/bots/test.dart                            | 23 ++++++++++---------
 packages/flutter_tools/lib/src/artifacts.dart |  4 ++--
 .../lib/src/commands/build_web.dart           |  8 ++-----
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index 8046b315ba..509120cc1b 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -191,21 +191,22 @@ Future<void> _runBuildTests() async {
     await _flutterBuildApk(path);
     await _flutterBuildIpa(path);
   }
-  await _flutterBuildDart2js(path.join('dev', 'integration_tests', 'web'));
+  // TODO(jonahwilliams): re-enable when engine rolls.
+  //await _flutterBuildDart2js(path.join('dev', 'integration_tests', 'web'));
 
   print('${bold}DONE: All build tests successful.$reset');
 }
 
-Future<void> _flutterBuildDart2js(String relativePathToApplication) async {
-  print('Running Dart2JS build tests...');
-  await runCommand(flutter,
-    <String>['build', 'web', '-v'],
-    workingDirectory: path.join(flutterRoot, relativePathToApplication),
-    expectNonZeroExit: false,
-    timeout: _kShortTimeout,
-  );
-  print('Done.');
-}
+// Future<void> _flutterBuildDart2js(String relativePathToApplication) async {
+//   print('Running Dart2JS build tests...');
+//   await runCommand(flutter,
+//     <String>['build', 'web', '-v'],
+//     workingDirectory: path.join(flutterRoot, relativePathToApplication),
+//     expectNonZeroExit: false,
+//     timeout: _kShortTimeout,
+//   );
+//   print('Done.');
+// }
 
 Future<void> _flutterBuildAot(String relativePathToApplication) async {
   print('Running AOT build tests...');
diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
index 23aa5f04f0..fad22286bc 100644
--- a/packages/flutter_tools/lib/src/artifacts.dart
+++ b/packages/flutter_tools/lib/src/artifacts.dart
@@ -73,9 +73,9 @@ String _artifactToFileName(Artifact artifact, [ TargetPlatform platform, BuildMo
     case Artifact.engineDartBinary:
       return 'dart';
     case Artifact.dart2jsSnapshot:
-      return 'dart2js.dart.snapshot';
+      return 'flutter_dart2js.dart.snapshot';
     case Artifact.kernelWorkerSnapshot:
-      return 'kernel_worker.dart.snapshot';
+      return 'flutter_kernel_worker.dart.snapshot';
   }
   assert(false, 'Invalid artifact $artifact.');
   return null;
diff --git a/packages/flutter_tools/lib/src/commands/build_web.dart b/packages/flutter_tools/lib/src/commands/build_web.dart
index 5ae7c62d30..a1a464585e 100644
--- a/packages/flutter_tools/lib/src/commands/build_web.dart
+++ b/packages/flutter_tools/lib/src/commands/build_web.dart
@@ -4,11 +4,10 @@
 
 import 'dart:async';
 
-import '../base/common.dart';
 import '../base/logger.dart';
 import '../build_info.dart';
 import '../globals.dart';
-import '../runner/flutter_command.dart' show FlutterCommandResult;
+import '../runner/flutter_command.dart' show ExitStatus, FlutterCommandResult;
 import '../web/compile.dart';
 import 'build.dart';
 
@@ -34,9 +33,6 @@ class BuildWebCommand extends BuildSubCommand {
     final Status status = logger.startProgress('Compiling $target to JavaScript...', timeout: null);
     final int result = await webCompiler.compile(target: target);
     status.stop();
-    if (result != 0) {
-      throwToolExit('JavaScript compilation failed.');
-    }
-    return null;
+    return FlutterCommandResult(result == 0 ? ExitStatus.success : ExitStatus.fail);
   }
 }