From 0a2175f1336db99991049d7156ded4efbe02a796 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Wed, 27 Mar 2019 15:24:08 -0700
Subject: [PATCH] Pass FLUTTER_TOOL_ARGS to snapshot command. (#29938)

---
 bin/flutter        | 2 +-
 bin/flutter.bat    | 6 +++++-
 dev/bots/test.dart | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bin/flutter b/bin/flutter
index 178994f56df..dc9425def0d 100755
--- a/bin/flutter
+++ b/bin/flutter
@@ -121,7 +121,7 @@ function upgrade_flutter () {
 
     retry_upgrade
 
-    "$DART" --snapshot="$SNAPSHOT_PATH" --snapshot-kind=app-jit --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" training
+    "$DART" $FLUTTER_TOOL_ARGS --snapshot="$SNAPSHOT_PATH" --snapshot-kind=app-jit --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" training
     echo "$revision" > "$STAMP_PATH"
   fi
   # The exit here is duplicitous since the function is run in a subshell,
diff --git a/bin/flutter.bat b/bin/flutter.bat
index 7aa7020c2b9..3ee58af9dcf 100644
--- a/bin/flutter.bat
+++ b/bin/flutter.bat
@@ -152,7 +152,11 @@ GOTO :after_subroutine
 
     POPD
 
-    "%dart%" --snapshot="%snapshot_path%" --snapshot-kind=app-jit --packages="%flutter_tools_dir%\.packages" "%script_path%"
+    IF "%FLUTTER_TOOL_ARGS%" == "" (
+      "%dart%" --snapshot="%snapshot_path%" --snapshot-kind=app-jit --packages="%flutter_tools_dir%\.packages" "%script_path%"
+    ) else (
+      "%dart%" "%FLUTTER_TOOL_ARGS%" --snapshot="%snapshot_path%" --snapshot-kind=app-jit --packages="%flutter_tools_dir%\.packages" "%script_path%"
+    )
     IF "%ERRORLEVEL%" NEQ "0" (
       ECHO Error: Unable to create dart snapshot for flutter tool.
       SET exit_code=%ERRORLEVEL%
diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index 60a54b8b86f..5b92184caa8 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -180,16 +180,24 @@ Future<void> _runToolTests() async {
   final bq.BigqueryApi bigqueryApi = await _getBigqueryApi();
   await _runSmokeTests();
 
+  // The flutter_tool will currently be snapshotted without asserts. We need
+  // to force it to be regenerated with them enabled.
+  if (!Platform.isWindows) {
+    File(path.join(flutterRoot, 'bin', 'cache', 'flutter_tools.snapshot')).deleteSync();
+    File(path.join(flutterRoot, 'bin', 'cache', 'flutter_tools.stamp')).deleteSync();
+  }
   if (noUseBuildRunner) {
     await _pubRunTest(
       path.join(flutterRoot, 'packages', 'flutter_tools'),
       tableData: bigqueryApi?.tabledata,
+      enableFlutterToolAsserts: !Platform.isWindows,
     );
   } else {
     await _buildRunnerTest(
       path.join(flutterRoot, 'packages', 'flutter_tools'),
       flutterRoot,
       tableData: bigqueryApi?.tabledata,
+      enableFlutterToolAsserts: !Platform.isWindows,
     );
   }