From e19d74b51ad8efd43c1583887cbde123ae769f7b Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Wed, 2 Nov 2022 11:27:08 +0000 Subject: 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 --- test/1956-pop-frame-jit-calling/jvm-expected.patch | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 test/1956-pop-frame-jit-calling/jvm-expected.patch (limited to 'test/1956-pop-frame-jit-calling/jvm-expected.patch') diff --git a/test/1956-pop-frame-jit-calling/jvm-expected.patch b/test/1956-pop-frame-jit-calling/jvm-expected.patch deleted file mode 100644 index 6539d56b27..0000000000 --- a/test/1956-pop-frame-jit-calling/jvm-expected.patch +++ /dev/null @@ -1,36 +0,0 @@ -37,50d36 -< 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 -75,94d60 -< 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) -<