From deb6c933c8733b8acde2ecf9e35f4740cde7f2f4 Mon Sep 17 00:00:00 2001 From: Wez Date: Fri, 8 Feb 2019 22:45:29 +0000 Subject: [PATCH] Roll Fuchsia SDK from 7f1a00721378 to b28036ae4fcd The AutoRoll server is located here: https://autoroll.skia.org/r/fuchsia-sdk-chromium-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. We also need to refer to the global persisted storage area via a different path when calling SCP to the path we use from within the applications we run on the device. CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia-arm64-cast;luci.chromium.try:fuchsia-x64-cast Bug: 930182 Change-Id: Ie927ac82959345f2605fcbf604c90409b4853f88 Reviewed-on: https://chromium-review.googlesource.com/c/1461307 Commit-Queue: James Robinson Reviewed-by: James Robinson Reviewed-by: Kevin Marshall Reviewed-by: Wez Auto-Submit: Wez Cr-Commit-Position: refs/heads/master@{#630501} --- build/fuchsia/linux.sdk.sha1 | 2 +- build/fuchsia/mac.sdk.sha1 | 2 +- build/fuchsia/test_runner.py | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1 index b3148121bc574b..7b5e53f8230d23 100644 --- a/build/fuchsia/linux.sdk.sha1 +++ b/build/fuchsia/linux.sdk.sha1 @@ -1 +1 @@ -7f1a007213780da98da29a3c80afc84e4f896e79 \ No newline at end of file +b28036ae4fcd676525469aa59ad1c6e6c34a2811 \ No newline at end of file diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1 index abe730e2a5f2f3..44b670a9fa006f 100644 --- a/build/fuchsia/mac.sdk.sha1 +++ b/build/fuchsia/mac.sdk.sha1 @@ -1 +1 @@ -88f471b1f1b5b6a38a905f77ca2ff8d40cf6a9ed \ No newline at end of file +c785fb3cca09f6231b637f7293c6334efa3c3257 \ No newline at end of file diff --git a/build/fuchsia/test_runner.py b/build/fuchsia/test_runner.py index cd45024d87ca9e..32a0ea4a3afb97 100755 --- a/build/fuchsia/test_runner.py +++ b/build/fuchsia/test_runner.py @@ -21,8 +21,11 @@ from run_package import RunPackage, RunPackageArgs DEFAULT_TEST_CONCURRENCY = 4 +# TODO(https://crbug.com/930182): Migrate off of deprecated global storage. TEST_RESULT_PATH = '/data/test_summary.json' +TEST_RESULT_SCP_PATH = '/data/deprecated-global-persistent-storage/test_summary.json' TEST_FILTER_PATH = '/data/test_filter.txt' +TEST_FILTER_SCP_PATH = '/data/deprecated-global-persistent-storage/test_filter.txt' def main(): parser = argparse.ArgumentParser() @@ -103,7 +106,7 @@ def main(): target.Start() if args.test_launcher_filter_file: - target.PutFile(args.test_launcher_filter_file, TEST_FILTER_PATH) + target.PutFile(args.test_launcher_filter_file, TEST_FILTER_SCP_PATH) child_args.append('--test-launcher-filter-file=' + TEST_FILTER_PATH) test_server = None @@ -119,7 +122,7 @@ def main(): test_server.Stop() if args.test_launcher_summary_output: - target.GetFile(TEST_RESULT_PATH, args.test_launcher_summary_output) + target.GetFile(TEST_RESULT_SCP_PATH, args.test_launcher_summary_output) return returncode