diff options
| -rw-r--r-- | test/1953-pop-frame/run.py | 2 | ||||
| -rw-r--r-- | test/1954-pop-frame-jit/run.py | 2 | ||||
| -rw-r--r-- | test/1955-pop-frame-jit-called/run.py | 2 | ||||
| -rw-r--r-- | test/1956-pop-frame-jit-calling/run.py | 2 | ||||
| -rw-r--r-- | test/1969-force-early-return-void/run.py | 3 | ||||
| -rwxr-xr-x | test/default_run.py | 4 |
6 files changed, 7 insertions, 8 deletions
diff --git a/test/1953-pop-frame/run.py b/test/1953-pop-frame/run.py index 81e237f6be..6438a1b50f 100644 --- a/test/1953-pop-frame/run.py +++ b/test/1953-pop-frame/run.py @@ -25,6 +25,6 @@ def run(ctx, args): # 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 not args.prebuild or + if not (args.jvm or not args.prebuild or (args.jvmti_redefine_stress and args.host)): ctx.expected_stdout = ctx.expected_stdout.with_suffix(".no-jvm.txt") diff --git a/test/1954-pop-frame-jit/run.py b/test/1954-pop-frame-jit/run.py index 459b44752a..43ece3679f 100644 --- a/test/1954-pop-frame-jit/run.py +++ b/test/1954-pop-frame-jit/run.py @@ -25,6 +25,6 @@ def run(ctx, args): # 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 not args.prebuild or + if (args.jvm or not args.prebuild or (args.jvmti_redefine_stress and args.host)): ctx.expected_stdout = ctx.expected_stdout.with_suffix(".jvm.txt") diff --git a/test/1955-pop-frame-jit-called/run.py b/test/1955-pop-frame-jit-called/run.py index a43b17d4f4..44fe18e0ef 100644 --- a/test/1955-pop-frame-jit-called/run.py +++ b/test/1955-pop-frame-jit-called/run.py @@ -31,6 +31,6 @@ def run(ctx, args): # 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 not args.prebuild or + if (args.jvm or not args.prebuild or (args.jvmti_redefine_stress and args.host)): ctx.expected_stdout = ctx.expected_stdout.with_suffix(".jvm.txt") diff --git a/test/1956-pop-frame-jit-calling/run.py b/test/1956-pop-frame-jit-calling/run.py index a43b17d4f4..44fe18e0ef 100644 --- a/test/1956-pop-frame-jit-calling/run.py +++ b/test/1956-pop-frame-jit-calling/run.py @@ -31,6 +31,6 @@ def run(ctx, args): # 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 not args.prebuild or + if (args.jvm or not args.prebuild or (args.jvmti_redefine_stress and args.host)): ctx.expected_stdout = ctx.expected_stdout.with_suffix(".jvm.txt") diff --git a/test/1969-force-early-return-void/run.py b/test/1969-force-early-return-void/run.py index dda04dfe31..d80f46f9a0 100644 --- a/test/1969-force-early-return-void/run.py +++ b/test/1969-force-early-return-void/run.py @@ -21,6 +21,5 @@ def run(ctx, args): # 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 not args.prebuild or - (args.jvmti_redefine_stress and args.host)): + if not (not args.prebuild or (args.jvmti_redefine_stress and args.host)): ctx.expected_stdout = ctx.expected_stdout.with_suffix(".no-jvm.txt") diff --git a/test/default_run.py b/test/default_run.py index e102311ce7..e3e5d21dbb 100755 --- a/test/default_run.py +++ b/test/default_run.py @@ -669,8 +669,8 @@ def default_run(ctx, args, **kwargs): INT_OPTS += " -Xcompiler-option --compiler-filter=verify" COMPILE_FLAGS += " --compiler-filter=verify" elif VERIFY == "s": - INT_OPTS += " -Xcompiler-option --compiler-filter=extract" - COMPILE_FLAGS += " --compiler-filter=extract" + INT_OPTS += " -Xcompiler-option --compiler-filter=verify" + COMPILE_FLAGS += " --compiler-filter=verify" DEX_VERIFY = f"{DEX_VERIFY} -Xverify:softfail" else: # VERIFY == "n" INT_OPTS += " -Xcompiler-option --compiler-filter=assume-verified" |