summaryrefslogtreecommitdiff
path: root/test/1953-pop-frame/class-loading-expected.patch
diff options
context:
space:
mode:
author Alex Light <allight@google.com> 2020-04-27 10:00:31 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> 2020-04-27 23:53:49 +0000
commit06c0d175ef915b71e31b83bc2461e1cb9f09c9e4 (patch)
treeefaa12e1c80d75534e7c786d328e28211776ba82 /test/1953-pop-frame/class-loading-expected.patch
parent7c25b09f62eb87b72bd8a98a31ea10fd97050f82 (diff)
Fix tests 1953, 1954, 1955 and, 1956 on --jvm
These tests check the behavior of pop-frame and should run successfully on the RI. Unfortunately in the time since they were added the RI changed some of its behavior around using PopFrame with NotifyFramePopped, now crashing when this combination of behaviors is exercised. Make the test skip these cases when running on RI. Bug: 154802847 Test: ./test/run-test --host --jvm 1953 Change-Id: Ia375cc9d13ca67a9512aa1b279fbcff1ec2feeec
Diffstat (limited to 'test/1953-pop-frame/class-loading-expected.patch')
-rw-r--r--test/1953-pop-frame/class-loading-expected.patch17
1 files changed, 16 insertions, 1 deletions
diff --git a/test/1953-pop-frame/class-loading-expected.patch b/test/1953-pop-frame/class-loading-expected.patch
index 2edef15dfd..1a5eda7fd6 100644
--- a/test/1953-pop-frame/class-loading-expected.patch
+++ b/test/1953-pop-frame/class-loading-expected.patch
@@ -1,4 +1,19 @@
-74a75,94
+36a37,50
+> Test stopped during notifyFramePop without exception on pop of calledFunction
+> Single call with PopFrame on StandardTestObject { cnt: 0 } base-call-count: 0
+> result is StandardTestObject { cnt: 2 } base-call count: 1
+> Test stopped during notifyFramePop without exception on pop of doNothing
+> Single call with PopFrame on StandardTestObject { cnt: 0 } base-call-count: 0
+> result is StandardTestObject { cnt: 1 } base-call count: 1
+> Test stopped during notifyFramePop with exception on pop of calledFunction
+> Single call with PopFrame on ExceptionThrowTestObject { cnt: 0 } base-call-count: 0
+> art.Test1953$ExceptionThrowTestObject$TestError thrown and caught!
+> result is ExceptionThrowTestObject { cnt: 2 } base-call count: 1
+> Test stopped during notifyFramePop with exception on pop of doThrow
+> Single call with PopFrame on ExceptionCatchTestObject { cnt: 0 } base-call-count: 0
+> art.Test1953$ExceptionCatchTestObject$TestError caught in called function.
+> result is ExceptionCatchTestObject { cnt: 1 } base-call count: 1
+60a75,94
> Test stopped during a ClassLoad event.
> Single call with PopFrame on ClassLoadObject { cnt: 0, curClass: 0} base-call-count: 0
> Failed to pop frame due to java.lang.RuntimeException: JVMTI_ERROR_OPAQUE_FRAME