diff options
| author | 2025-01-29 05:50:39 -0800 | |
|---|---|---|
| committer | 2025-01-29 05:50:39 -0800 | |
| commit | aa50628e1f1693e77bfbdc09d9abd58116a22079 (patch) | |
| tree | 5f5c37c620f389af7a6d8e9e8cf379fc68044b85 | |
| parent | 94b71e2afefd9b62516ade8cae590bb62c568bda (diff) | |
| parent | aabf9bc3c02a423b4ea946a79c13614edc687ef2 (diff) | |
Ignore hiddenapi denial errors on qemu as well. am: 72345a79d5 am: aabf9bc3c0
Original change: https://android-review.googlesource.com/c/platform/art/+/3464976
Change-Id: I396236700c9af377e19486489c4092adb166b4fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | test/2038-hiddenapi-jvmti-ext/run.py | 5 | ||||
| -rw-r--r-- | test/674-hiddenapi/run.py | 5 | ||||
| -rw-r--r-- | test/817-hiddenapi/run.py | 5 | ||||
| -rw-r--r-- | test/999-redefine-hiddenapi/run.py | 5 |
4 files changed, 8 insertions, 12 deletions
diff --git a/test/2038-hiddenapi-jvmti-ext/run.py b/test/2038-hiddenapi-jvmti-ext/run.py index c3f6d8fb72..49a7ef365a 100644 --- a/test/2038-hiddenapi-jvmti-ext/run.py +++ b/test/2038-hiddenapi-jvmti-ext/run.py @@ -18,6 +18,5 @@ def run(ctx, args): ctx.default_run(args, jvmti=True) - # Delete hiddenapi's denial errors which go to stderr on host. - if args.host: - ctx.run(fr"sed -i -E '/ E dalvikvm.* hiddenapi: /d' '{args.stderr_file}'") + # Ignore hiddenapi's denial errors which go to stderr on host and qemu (but not on device). + ctx.run(fr"sed -i -E '/ E dalvikvm.* hiddenapi: /d' '{args.stderr_file}'") diff --git a/test/674-hiddenapi/run.py b/test/674-hiddenapi/run.py index ea0cd1d3b5..7967a46047 100644 --- a/test/674-hiddenapi/run.py +++ b/test/674-hiddenapi/run.py @@ -25,6 +25,5 @@ def run(ctx, args): ctx.run(fr"sed -i -E '/(JNI_OnLoad|JNI_OnUnload)/d' '{args.stdout_file}'") - # Delete hiddenapi's denial errors which go to stderr on host. - if args.host: - ctx.run(fr"sed -i -E '/ E dalvikvm.* hiddenapi: /d' '{args.stderr_file}'") + # Ignore hiddenapi's denial errors which go to stderr on host and qemu (but not on device). + ctx.run(fr"sed -i -E '/ E dalvikvm.* hiddenapi: /d' '{args.stderr_file}'") diff --git a/test/817-hiddenapi/run.py b/test/817-hiddenapi/run.py index 14670eb0c5..a394a4ea29 100644 --- a/test/817-hiddenapi/run.py +++ b/test/817-hiddenapi/run.py @@ -21,6 +21,5 @@ def run(ctx, args): # be emitted. If so, remove it. ctx.run(fr"sed -i '/^JNI_OnUnload called$/d' '{args.stdout_file}'") - # Delete hiddenapi's denial errors which go to stderr on host. - if args.host: - ctx.run(fr"sed -i -E '/ E dalvikvm.* hiddenapi: /d' '{args.stderr_file}'") + # Ignore hiddenapi's denial errors which go to stderr on host and qemu (but not on device). + ctx.run(fr"sed -i -E '/ E dalvikvm.* hiddenapi: /d' '{args.stderr_file}'") diff --git a/test/999-redefine-hiddenapi/run.py b/test/999-redefine-hiddenapi/run.py index c3f6d8fb72..49a7ef365a 100644 --- a/test/999-redefine-hiddenapi/run.py +++ b/test/999-redefine-hiddenapi/run.py @@ -18,6 +18,5 @@ def run(ctx, args): ctx.default_run(args, jvmti=True) - # Delete hiddenapi's denial errors which go to stderr on host. - if args.host: - ctx.run(fr"sed -i -E '/ E dalvikvm.* hiddenapi: /d' '{args.stderr_file}'") + # Ignore hiddenapi's denial errors which go to stderr on host and qemu (but not on device). + ctx.run(fr"sed -i -E '/ E dalvikvm.* hiddenapi: /d' '{args.stderr_file}'") |