v1.12.13+hotfix.5 cherry-picks (#14287)

tvolkert · web-flow · commit 2994f7e1e682 · 2019-12-10T12:29:30.000-08:00
* 253851e Move Fuchsia unit test runners into engine repo
diff --git a/BUILD.gn b/BUILD.gn
@@ -92,11 +92,6 @@ group("flutter") {
       ]
     }
   }
-
-  # Fuchsia currently only supports a subset of our unit tests
-  if (is_fuchsia) {
-    public_deps += [ "$flutter_root/fml:fml_tests" ]
-  }
 }
 
 config("config") {
@@ -124,3 +119,18 @@ group("dist") {
     "$flutter_root/sky/dist",
   ]
 }
+
+# Fuchsia currently only supports a subset of our unit tests
+# When adding a new dep here, please also ensure the dep is added to
+# testing/fuchsia/run_tests.sh and testing/fuchsia/test_fars
+if (is_fuchsia) {
+  group("fuchsia_tests") {
+    testonly = true
+
+    deps = [
+      # TODO(gw280): Re-enable fml_tests on Fuchsia (https://github.com/flutter/flutter/issues/46122)
+      #     "$flutter_root/fml:fml_tests",
+      "$flutter_root/shell/platform/fuchsia/flutter:flutter_runner_tests",
+    ]
+  }
+}
diff --git a/testing/fuchsia/run_tests.sh b/testing/fuchsia/run_tests.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# This expects the device to be in zedboot mode, with a zedboot that is
+# is compatible with the Fuchsia system image provided.
+#
+# The first and only parameter should be the path to the Fuchsia system image
+# tarball, e.g. `./fuchsia-test.sh generic-x64.tgz`.
+#
+# This script expects `pm`, `dev_finder`, and `fuchsia_ctl` to all be in the
+# same directory as the script, as well as the `flutter_aot_runner-0.far` and
+# the `flutter_runner_tests-0.far`. It is written to be run from its own
+# directory, and will fail if run from other directories or via sym-links.
+
+set -Ee
+
+# The nodes are named blah-blah--four-word-fuchsia-id
+device_name=${SWARMING_BOT_ID#*--}
+
+if [ -z "$device_name" ]
+then
+  echo "No device found. Aborting."
+  exit 1
+else
+  echo "Connecting to device $device_name"
+fi
+
+reboot() {
+  # note: this will set an exit code of 255, which we can ignore.
+  ./fuchsia_ctl -d $device_name ssh -c "dm reboot-recovery" || true
+}
+
+trap reboot EXIT
+
+./fuchsia_ctl -d $device_name pave  -i $1
+
+# TODO(gw280): Enable tests using JIT runner
+./fuchsia_ctl -d $device_name test \
+    -f flutter_aot_runner-0.far    \
+    -f flutter_runner_tests-0.far  \
+    -t flutter_runner_tests
+
diff --git a/testing/fuchsia/test_fars b/testing/fuchsia/test_fars
@@ -0,0 +1 @@
+flutter_runner_tests-0.far
diff --git a/tools/fuchsia/fuchsia_archive.gni b/tools/fuchsia/fuchsia_archive.gni
@@ -68,7 +68,7 @@ template("fuchsia_archive") {
       "$cmx_file",
     ]
     outputs = [
-      "$far_base_dir/meta/{{source_file_part}}",
+      "$far_base_dir/meta/${pkg_target_name}.cmx",
     ]
   }
 

Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,6 @@ group("flutter") {`
`92`	`92`	`]`
`93`	`93`	`}`
`94`	`94`	`}`
`95`		`-`
`96`		`- # Fuchsia currently only supports a subset of our unit tests`
`97`		`- if (is_fuchsia) {`
`98`		`- public_deps += [ "$flutter_root/fml:fml_tests" ]`
`99`		`- }`
`100`	`95`	`}`
`101`	`96`
`102`	`97`	`config("config") {`
`@@ -124,3 +119,18 @@ group("dist") {`
`124`	`119`	`"$flutter_root/sky/dist",`
`125`	`120`	`]`
`126`	`121`	`}`
	`122`	`+`
	`123`	`+# Fuchsia currently only supports a subset of our unit tests`
	`124`	`+# When adding a new dep here, please also ensure the dep is added to`
	`125`	`+# testing/fuchsia/run_tests.sh and testing/fuchsia/test_fars`
	`126`	`+if (is_fuchsia) {`
	`127`	`+ group("fuchsia_tests") {`
	`128`	`+ testonly = true`
	`129`	`+`
	`130`	`+ deps = [`
	`131`	`+ # TODO(gw280): Re-enable fml_tests on Fuchsia (https://github.com/flutter/flutter/issues/46122)`
	`132`	`+ # "$flutter_root/fml:fml_tests",`
	`133`	`+ "$flutter_root/shell/platform/fuchsia/flutter:flutter_runner_tests",`
	`134`	`+ ]`
	`135`	`+ }`
	`136`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ template("fuchsia_archive") {`
`68`	`68`	`"$cmx_file",`
`69`	`69`	`]`
`70`	`70`	`outputs = [`
`71`		`- "$far_base_dir/meta/{{source_file_part}}",`
	`71`	`+ "$far_base_dir/meta/${pkg_target_name}.cmx",`
`72`	`72`	`]`
`73`	`73`	`}`
`74`	`74`