diff options
author | android-autoroll <android-autoroll@skia-public.iam.gserviceaccount.com> | 2024-04-19 10:42:31 +0000 |
---|---|---|
committer | android-autoroll <android-autoroll@skia-public.iam.gserviceaccount.com> | 2024-04-19 10:42:31 +0000 |
commit | c4db00fa37fd5404d04d7245600e0b3849bd327d (patch) | |
tree | a7e7b6fbddfe03e731beaf5c3db2d1e9750fc8d8 /build/android/test_runner.py | |
parent | 36b725a37bc92320f1b5c20e77bf28cc89f9e14f (diff) | |
parent | 602a6a9a532fac607e3c36824a8998e270d406a4 (diff) | |
download | angle-c4db00fa37fd5404d04d7245600e0b3849bd327d.tar.gz |
Roll ANGLE from 51c580031adc to 602a6a9a532f (12 revisions)
https://chromium.googlesource.com/angle/angle.git/+log/51c580031adc..602a6a9a532f
Please enable autosubmit on changes if possible when approving them.
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/angle-android-autoroll
Please CC angle-team@google.com,rmistry@google.com,syoussefi@google.com on the revert to ensure that a human
is aware of the problem.
To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry
To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Bug: b/223456677
Bug: b/315353258
Bug: b/335295728
Bug: b/335496851
Bug: b/335541479
Change-Id: Ifa31e37877cf9d56784dc31ca1096b9307474b85
Diffstat (limited to 'build/android/test_runner.py')
-rwxr-xr-x | build/android/test_runner.py | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/build/android/test_runner.py b/build/android/test_runner.py index 7ee3405d86..cb265e7260 100755 --- a/build/android/test_runner.py +++ b/build/android/test_runner.py @@ -398,6 +398,12 @@ def AddGTestOptions(parser): parser = parser.add_argument_group('gtest arguments') parser.add_argument( + '--additional-apk', + action='append', dest='additional_apks', default=[], + type=_RealPath, + help='Additional apk that must be installed on ' + 'the device when the tests are run.') + parser.add_argument( '--app-data-file', action='append', dest='app_data_files', help='A file path relative to the app data directory ' @@ -1470,4 +1476,16 @@ def main(): if __name__ == '__main__': - sys.exit(main()) + exit_code = main() + if exit_code == constants.INFRA_EXIT_CODE: + # This exit code is returned in case of missing, unreachable, + # or otherwise not fit for purpose test devices. + # When this happens, the graceful cleanup triggered by sys.exit() + # hangs indefinitely (on swarming - until it hits 20min timeout). + # Skip cleanup (other than flushing output streams) and exit forcefully + # to avoid the hang. + sys.stdout.flush() + sys.stderr.flush() + os._exit(exit_code) # pylint: disable=protected-access + else: + sys.exit(exit_code) |