Hi,
On Thu, Oct 20, 2022 at 01:25:44PM -0700, Carl Love wrote:
> The only issue noted, as discussed on #valgrind-dev channel, is the
> addition of four post errors for the 3.20RC tree on all of the Power
> platforms. Specifically:
>
> cachegrind/tests/ann1 (post)
> cachegrind/tests/ann2 (post)
> callgrind/tests/ann1 (post)
> callgrind/tests/ann2 (post)
>
> The output from cachegrind/tests/ann1.post.diff is:
>
> --- ann1.post.exp 2021-01-21 09:09:33.000000000 -0600
> +++ ann1.post.out 2022-10-20 14:07:33.272141328 -0500
> @@ -33,6 +33,13 @@
> --------------------------------------------------------------------
> -----------
> -
> -- Auto-annotated source: a.c
> --------------------------------------------------------------------
> -----------
> -
> +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
> @@@@@@@@@
> +@@ WARNING @@ WARNING @@ WARNING @@ WARNING @@ WARNING @@ WARNING @@
> WARNING @@
> +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
> @@@@@@@@@
> +@ Source file 'a.c' is more recent than input file 'cgout-test'.
> +@ Annotations may not be correct.
> +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
> @@@@@@@@@
> +
> Ir I1mr ILmr
>
> 2 0 0 int main(void) {
>
> As discussed on the #valgrind-dev channel, this appears to be a
> timestamp issue. Doing a touch * in directory cachegrind/tests seems
> to fix all four post errors.
>
> No other issues were noted. I would vote to do the touch * command and
> go ahead with the release.
I added the touch to the testcases as attached. That makes sure the
cgout-test file is always newer.
Cheers,
Mark
>From 206dbcfed93f22370e03a03dd07f14ab675e24a8 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <[email protected]>
Date: Sat, 22 Oct 2022 17:29:00 +0200
Subject: [PATCH] {callgrind,callgrind}/tests/ann{1,2}.vgtest touch cgout-test
Both a.c and cgout-test are checked into the repository and
used in testcases. Make sure cgout-test is newer than a.c
before running the post script to prevent warnings liks:
@@ WARNING @@ WARNING @@ WARNING @@ WARNING @@ WARNING @@ WARNING @@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@ Source file 'a.c' is more recent than input file
../../cachegrind/tests/cgout-test'.
@ Annotations may not be correct.
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
---
cachegrind/tests/ann1.vgtest | 2 +-
cachegrind/tests/ann2.vgtest | 2 +-
callgrind/tests/ann1.vgtest | 2 +-
callgrind/tests/ann2.vgtest | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cachegrind/tests/ann1.vgtest b/cachegrind/tests/ann1.vgtest
index 676fe3199..e3e574276 100644
--- a/cachegrind/tests/ann1.vgtest
+++ b/cachegrind/tests/ann1.vgtest
@@ -2,5 +2,5 @@
# the post-processing of the cgout-test file.
prog: ../../tests/true
vgopts: --cachegrind-out-file=cachegrind.out
-post: perl ../../cachegrind/cg_annotate --show=Ir,I1mr,ILmr --show-percs=no cgout-test
+post: touch cgout-test && perl ../../cachegrind/cg_annotate --show=Ir,I1mr,ILmr --show-percs=no cgout-test
cleanup: rm cachegrind.out
diff --git a/cachegrind/tests/ann2.vgtest b/cachegrind/tests/ann2.vgtest
index 5acc68b8d..14ccd24db 100644
--- a/cachegrind/tests/ann2.vgtest
+++ b/cachegrind/tests/ann2.vgtest
@@ -2,5 +2,5 @@
# the post-processing of the cgout-test file.
prog: ../../tests/true
vgopts: --cachegrind-out-file=cachegrind.out
-post: perl ../../cachegrind/cg_annotate --sort=Dr --show=Dw,Dr,Ir --auto=yes cgout-test
+post: touch cgout-test && perl ../../cachegrind/cg_annotate --sort=Dr --show=Dw,Dr,Ir --auto=yes cgout-test
cleanup: rm cachegrind.out
diff --git a/callgrind/tests/ann1.vgtest b/callgrind/tests/ann1.vgtest
index 4ad9ae390..3c53e1f55 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: perl ../../callgrind/callgrind_annotate --show=Ir,I1mr,ILmr --show-percs=no --include=../../cachegrind/tests ../../cachegrind/tests/cgout-test
+post: touch ../../cachegrind/tests/cgout-test && perl ../../callgrind/callgrind_annotate --show=Ir,I1mr,ILmr --show-percs=no --include=../../cachegrind/tests ../../cachegrind/tests/cgout-test
cleanup: rm callgrind.out
diff --git a/callgrind/tests/ann2.vgtest b/callgrind/tests/ann2.vgtest
index 30e177907..9b7dffa0f 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: perl ../../callgrind/callgrind_annotate --sort=Dr --show=Dw,Dr,Ir --auto=yes --include=../../cachegrind/tests ../../cachegrind/tests/cgout-test
+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
cleanup: rm callgrind.out
--
2.37.3
_______________________________________________
Valgrind-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/valgrind-users
