diff options
author | 2022-11-21 15:27:46 +0000 | |
---|---|---|
committer | 2022-11-21 23:13:44 +0000 | |
commit | 6311173e62a1865d31f4028ddefac62a5f4de53b (patch) | |
tree | 16ba3321b2a3aaaaacf3e1f991bc759da50ee12a /test/default_run.py | |
parent | c095a839c6f1799ff9ac7721b9835b417c4075a3 (diff) |
Run test: Remove on-device signal_dumper detection
The ART APEX is already first on the $PATH and should always exist.
Just let the usual path lookup logic find the signal_dumper binary.
Test: ./art/test.py -b -r --optimizing --64 001-HelloWorld
Change-Id: Id54750bc1d3ca9d6ba74dad69fab1459ec4b39a5
Diffstat (limited to 'test/default_run.py')
-rwxr-xr-x | test/default_run.py | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/test/default_run.py b/test/default_run.py index b5afd8c4a9..c6d6563ca1 100755 --- a/test/default_run.py +++ b/test/default_run.py @@ -1193,30 +1193,6 @@ def default_run(ctx, args, **kwargs): timeout_dumper_cmd = "" - # Check whether signal_dumper is available. - if TIMEOUT_DUMPER == "signal_dumper": - # Chroot? Use as prefix for tests. - TIMEOUT_DUMPER_PATH_PREFIX = "" - if CHROOT: - TIMEOUT_DUMPER_PATH_PREFIX = f"{CHROOT}/" - - # Testing APEX? - if adb.shell( - f"test -x {TIMEOUT_DUMPER_PATH_PREFIX}/apex/com.android.art/bin/signal_dumper", - check=False, - save_cmd=False).returncode: - TIMEOUT_DUMPER = "/apex/com.android.art/bin/signal_dumper" - # Is it in /system/bin? - elif adb.shell( - f"test -x {TIMEOUT_DUMPER_PATH_PREFIX}/system/bin/signal_dumper", - check=False, - save_cmd=False).returncode: - TIMEOUT_DUMPER = "/system/bin/signal_dumper" - else: - TIMEOUT_DUMPER = "" - else: - TIMEOUT_DUMPER = "" - if TIMEOUT_DUMPER: # Use "-l" to dump to logcat. That is convenience for the build bot crash symbolization. # Use exit code 124 for toybox timeout (b/141007616). |