diff options
| author | 2025-03-21 12:04:34 -0700 | |
|---|---|---|
| committer | 2025-03-21 12:04:34 -0700 | |
| commit | b73b25fdd947faef7856ba9277581553a96f8675 (patch) | |
| tree | d59971c5123aae888aa7de90665c9a3d3fc9a4d8 | |
| parent | de042482edc3e5bf36967ec706fea968ba491368 (diff) | |
| parent | 2371fcce4b16f06bf5d2280f0423264f9b948eb7 (diff) | |
Run-test: Remove sanitize_dex2oat_cmdline am: 2371fcce4b
Original change: https://android-review.googlesource.com/c/platform/art/+/3554364
Change-Id: I5b377dc564cd9c85ed31b0bab780ed3182f2c7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | test/default_run.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/test/default_run.py b/test/default_run.py index 85cf4a97ad..21673f79a3 100755 --- a/test/default_run.py +++ b/test/default_run.py @@ -920,19 +920,11 @@ def default_run(ctx, args, **kwargs): if SIMPLEPERF: dalvikvm_cmdline = f"simpleperf record {dalvikvm_cmdline} && simpleperf report" - def sanitize_dex2oat_cmdline(cmdline: str) -> str: - args = [] - for arg in cmdline.split(" "): - if arg == "--class-loader-context=&": - arg = r"--class-loader-context=\&" - args.append(arg) - return " ".join(args) - # Remove whitespace. - dex2oat_cmdline = sanitize_dex2oat_cmdline(dex2oat_cmdline) + dex2oat_cmdline = re.sub(" +", " ", dex2oat_cmdline) dalvikvm_cmdline = re.sub(" +", " ", dalvikvm_cmdline) dm_cmdline = re.sub(" +", " ", dm_cmdline) - vdex_cmdline = sanitize_dex2oat_cmdline(vdex_cmdline) + vdex_cmdline = re.sub(" +", " ", vdex_cmdline) profman_cmdline = re.sub(" +", " ", profman_cmdline) # Use an empty ASAN_OPTIONS to enable defaults. |