[Fuchsia] Update test-scripts to include https://crrev.com/c/5177940
ffx will change the way product lookup prints out the download url, but the original solution is less ideal and using json is definitely better. So using the latest test-scripts would be a must-have before updating the fuchsia-sdk. A drive-by change is to return proc.returncode from with_envs.py. Change-Id: Ic4589597006226aa7f5b0e557fe1f084ad3a0a74 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/345567 Reviewed-by: Ryan Macnak <rmacnak@google.com> Reviewed-by: Alexander Thomas <athom@google.com> Commit-Queue: Zijie He <zijiehe@google.com>
This commit is contained in:
@@ -82,7 +82,7 @@ vars = {
|
||||
"reclient_version": "git_revision:f3883c2237b0eb9cc9524cb571b5ab8378f257e4",
|
||||
|
||||
# Update from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core
|
||||
"fuchsia_sdk_version": "version:16.20231105.3.1",
|
||||
"fuchsia_sdk_version": "version:17.20240105.3.1",
|
||||
"download_fuchsia_deps": False,
|
||||
|
||||
# Ninja, runs the build based on files generated by GN.
|
||||
@@ -661,7 +661,7 @@ Var("dart_root") + "/third_party/pkg/tar":
|
||||
"packages": [
|
||||
{
|
||||
"package": "chromium/fuchsia/test-scripts",
|
||||
"version": "version:2@542d79b983ec1cdf95d9cb3aea0ea528a4b3569d",
|
||||
"version": "version:2@49064713a73ae92d8c28164938b97869afd336aa",
|
||||
}
|
||||
],
|
||||
"condition": 'download_fuchsia_deps',
|
||||
|
||||
@@ -5,10 +5,8 @@
|
||||
|
||||
import os
|
||||
import platform
|
||||
import signal
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
sys.path.insert(
|
||||
0,
|
||||
@@ -50,6 +48,7 @@ def Main():
|
||||
except:
|
||||
# Use terminate / SIGTERM to allow the subprocess exiting cleanly.
|
||||
proc.terminate()
|
||||
return proc.returncode
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Reference in New Issue
Block a user