From: Paul Floyd Date: Sun, 2 Apr 2023 08:12:17 +0000 (+0200) Subject: Regtest: fixes for callgrind tests referring to cachegrind reference files X-Git-Tag: VALGRIND_3_21_0~79 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=708d0eb6b489a23ee0cf103a699160af8fd352d5;p=valgrind.git Regtest: fixes for callgrind tests referring to cachegrind reference files cachegrind/tests/cgout-test was renamed to ann1.cgout but the two tests in callgrind that use it weren't updated. --- diff --git a/callgrind/tests/ann1.post.exp b/callgrind/tests/ann1.post.exp index 201b967d1d..1c68fc95c2 100644 --- a/callgrind/tests/ann1.post.exp +++ b/callgrind/tests/ann1.post.exp @@ -1,5 +1,5 @@ -------------------------------------------------------------------------------- -Profile data file '../../cachegrind/tests/cgout-test' +Profile data file '../../cachegrind/tests/ann1.cgout' -------------------------------------------------------------------------------- I1 cache: 32768 B, 64 B, 8-way associative D1 cache: 32768 B, 64 B, 8-way associative diff --git a/callgrind/tests/ann1.vgtest b/callgrind/tests/ann1.vgtest index 3c53e1f55e..6b355ef741 100644 --- a/callgrind/tests/ann1.vgtest +++ b/callgrind/tests/ann1.vgtest @@ -2,5 +2,5 @@ # the post-processing of the cgout-test file. prog: ../../tests/true vgopts: --callgrind-out-file=callgrind.out -post: touch ../../cachegrind/tests/cgout-test && perl ../../callgrind/callgrind_annotate --show=Ir,I1mr,ILmr --show-percs=no --include=../../cachegrind/tests ../../cachegrind/tests/cgout-test +post: touch ../../cachegrind/tests/ann1.cgout && perl ../../callgrind/callgrind_annotate --show=Ir,I1mr,ILmr --show-percs=no --include=../../cachegrind/tests ../../cachegrind/tests/ann1.cgout cleanup: rm callgrind.out diff --git a/callgrind/tests/ann2.post.exp b/callgrind/tests/ann2.post.exp index 47e5636038..3f6f17f6a3 100644 --- a/callgrind/tests/ann2.post.exp +++ b/callgrind/tests/ann2.post.exp @@ -1,5 +1,5 @@ -------------------------------------------------------------------------------- -Profile data file '../../cachegrind/tests/cgout-test' +Profile data file '../../cachegrind/tests/ann1.cgout' -------------------------------------------------------------------------------- I1 cache: 32768 B, 64 B, 8-way associative D1 cache: 32768 B, 64 B, 8-way associative diff --git a/callgrind/tests/ann2.vgtest b/callgrind/tests/ann2.vgtest index 9b7dffa0f0..9a4a565591 100644 --- a/callgrind/tests/ann2.vgtest +++ b/callgrind/tests/ann2.vgtest @@ -2,5 +2,5 @@ # the post-processing of the cgout-test file. prog: ../../tests/true vgopts: --callgrind-out-file=callgrind.out -post: touch ../../cachegrind/tests/cgout-test && perl ../../callgrind/callgrind_annotate --sort=Dr --show=Dw,Dr,Ir --auto=yes --include=../../cachegrind/tests ../../cachegrind/tests/cgout-test +post: touch ../../cachegrind/tests/ann1.cgout && perl ../../callgrind/callgrind_annotate --sort=Dr --show=Dw,Dr,Ir --auto=yes --include=../../cachegrind/tests ../../cachegrind/tests/ann1.cgout cleanup: rm callgrind.out