diff options
author | 2022-11-02 11:27:08 +0000 | |
---|---|---|
committer | 2022-11-03 00:30:21 +0000 | |
commit | e19d74b51ad8efd43c1583887cbde123ae769f7b (patch) | |
tree | 11450f99b1dc9ffd6f71a5f0ebe1b0c0f72867da /test/1953-pop-frame/class-loading-expected.patch | |
parent | 9c8c2dbad24ad505f9ccdf8d22314cbaaabef916 (diff) |
Run-tests: Fix/implement --update; avoid stdout patching.
The update has never worked reliably, but with the separation
of the `sed` and `diff` it is getting much better now.
Avoid stdout patching to improve --update mode further.
The tests still have stdout that differs based on flags.
Support those by having multiple (full) expected files.
Test: test.py -r --all-target --all-jvmti --all-prebuild \
-t 1931 -t 1932 -t 1936 -t 1950 -t 1953 \
-t 1954 -t 1955 -t 1956 -t 1969 -t 909
Change-Id: I070037717f9964755492b42b6efd52179deb4125
Diffstat (limited to 'test/1953-pop-frame/class-loading-expected.patch')
-rw-r--r-- | test/1953-pop-frame/class-loading-expected.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/test/1953-pop-frame/class-loading-expected.patch b/test/1953-pop-frame/class-loading-expected.patch deleted file mode 100644 index 1a5eda7fd6..0000000000 --- a/test/1953-pop-frame/class-loading-expected.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 -> art.Test1953.popFrame(Native Method) -> art.Test1953.runTestOn(Test1953.java) -> art.Test1953.runTestOn(Test1953.java) -> art.Test1953.runTests(Test1953.java) -> <Additional frames hidden> -> TC0.foo == 1 -> result is ClassLoadObject { cnt: 1, curClass: 1} base-call count: 1 -> Test stopped during a ClassPrepare event. -> Single call with PopFrame on ClassLoadObject { cnt: 0, curClass: 1} base-call-count: 0 -> Failed to pop frame due to java.lang.RuntimeException: JVMTI_ERROR_OPAQUE_FRAME -> art.Test1953.popFrame(Native Method) -> art.Test1953.runTestOn(Test1953.java) -> art.Test1953.runTestOn(Test1953.java) -> art.Test1953.runTests(Test1953.java) -> <Additional frames hidden> -> TC1.foo == 2 -> result is ClassLoadObject { cnt: 1, curClass: 2} base-call count: 1 |