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/1954-pop-frame-jit/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/1954-pop-frame-jit/run.py') diff --git a/test/1954-pop-frame-jit/run.py b/test/1954-pop-frame-jit/run.py index 4f8a0c252e..459b44752a 100644 --- a/test/1954-pop-frame-jit/run.py +++ b/test/1954-pop-frame-jit/run.py @@ -27,4 +27,4 @@ def run(ctx, args): # quite the right way so they are disabled there too. 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") + ctx.expected_stdout = ctx.expected_stdout.with_suffix(".jvm.txt") -- cgit v1.2.3-59-g8ed1b