Fix stdout-patching run tests on no-prebuild
Test: test.py -r --all-target --all-jvmti --all-prebuilt \
-t 1953 -t 1954 -t 1955 -t 1956 -t 1969
Change-Id: Id2540c0c38fb68842832547b863fa7c1bad52c7c
diff --git a/test/1953-pop-frame/run b/test/1953-pop-frame/run
index 5d7aabe..d529fb8 100755
--- a/test/1953-pop-frame/run
+++ b/test/1953-pop-frame/run
@@ -25,6 +25,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if not (args.jvm or args.verify_soft_fail or
+ if not (args.jvm or args.verify_soft_fail or not args.prebuild or
(args.jvmti_redefine_stress and args.host)):
ctx.run(fr"patch -p0 expected-stdout.txt < class-loading-expected.patch")
diff --git a/test/1954-pop-frame-jit/run b/test/1954-pop-frame-jit/run
index 5cf4277..4f8a0c2 100755
--- a/test/1954-pop-frame-jit/run
+++ b/test/1954-pop-frame-jit/run
@@ -25,6 +25,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if args.jvm or args.verify_soft_fail or (args.jvmti_redefine_stress and
- args.host):
+ if (args.jvm or args.verify_soft_fail or not args.prebuild or
+ (args.jvmti_redefine_stress and args.host)):
ctx.run(fr"patch -p0 expected-stdout.txt < jvm-expected.patch")
diff --git a/test/1955-pop-frame-jit-called/run b/test/1955-pop-frame-jit-called/run
index c11121c..5c78a23 100755
--- a/test/1955-pop-frame-jit-called/run
+++ b/test/1955-pop-frame-jit-called/run
@@ -31,6 +31,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if args.jvm or args.verify_soft_fail or (args.jvmti_redefine_stress and
- args.host):
+ if (args.jvm or args.verify_soft_fail or not args.prebuild or
+ (args.jvmti_redefine_stress and args.host)):
ctx.run(fr"patch -p0 expected-stdout.txt < jvm-expected.patch")
diff --git a/test/1956-pop-frame-jit-calling/run b/test/1956-pop-frame-jit-calling/run
index c11121c..5c78a23 100755
--- a/test/1956-pop-frame-jit-calling/run
+++ b/test/1956-pop-frame-jit-calling/run
@@ -31,6 +31,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if args.jvm or args.verify_soft_fail or (args.jvmti_redefine_stress and
- args.host):
+ if (args.jvm or args.verify_soft_fail or not args.prebuild or
+ (args.jvmti_redefine_stress and args.host)):
ctx.run(fr"patch -p0 expected-stdout.txt < jvm-expected.patch")
diff --git a/test/1969-force-early-return-void/run b/test/1969-force-early-return-void/run
index 03b63da..6866e1a 100755
--- a/test/1969-force-early-return-void/run
+++ b/test/1969-force-early-return-void/run
@@ -21,5 +21,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if not (args.verify_soft_fail or (args.jvmti_redefine_stress and args.host)):
+ if not (args.verify_soft_fail or not args.prebuild or
+ (args.jvmti_redefine_stress and args.host)):
ctx.run(fr"patch -p0 expected-stdout.txt < class-loading-expected.patch")