From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Tue, 28 Mar 2023 04:44:34 +0000 (+1100)
Subject: Simpler and more consistent `cachegrind/tests/*.vgtest` files.
X-Git-Tag: VALGRIND_3_21_0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e95328b12c9151919fd327ba2558ff4c0e9eb124;p=thirdparty%2Fvalgrind.git

Simpler and more consistent `cachegrind/tests/*.vgtest` files.

- Always use `python3`, never `python`.
- Avoid unnecessary `../cachegrind/` in paths.
---

diff --git a/cachegrind/tests/ann-diff1.vgtest b/cachegrind/tests/ann-diff1.vgtest
index b737b713e3..e379401876 100644
--- a/cachegrind/tests/ann-diff1.vgtest
+++ b/cachegrind/tests/ann-diff1.vgtest
@@ -2,5 +2,5 @@
 # the post-processing of the `ann{1,1b}.cgout` test files.
 prog: ../../tests/true
 vgopts: --cachegrind-out-file=cachegrind.out
-post: python ../../cachegrind/cg_diff --mod-funcname="s/main/MAIN/" ann1.cgout ann1b.cgout > ann-diff1.cgout && python ../../cachegrind/cg_annotate ann-diff1.cgout
+post: python3 ../cg_diff --mod-funcname="s/main/MAIN/" ann1.cgout ann1b.cgout > ann-diff1.cgout && python3 ../cg_annotate ann-diff1.cgout
 cleanup: rm ann-diff1.cgout
diff --git a/cachegrind/tests/ann-diff2.vgtest b/cachegrind/tests/ann-diff2.vgtest
index 101cac07d1..7b395e4e48 100644
--- a/cachegrind/tests/ann-diff2.vgtest
+++ b/cachegrind/tests/ann-diff2.vgtest
@@ -2,5 +2,5 @@
 # the post-processing of the `ann-diff2{a,b}.cgout` test files.
 prog: ../../tests/true
 vgopts: --cachegrind-out-file=cachegrind.out
-post: python ../../cachegrind/cg_diff --mod-filename="s/.*aux\//aux\//i" --mod-funcname="s/(f[a-z]*)[0-9]/\1N/g" ann-diff2a.cgout ann-diff2b.cgout > ann-diff2c.cgout && python ../../cachegrind/cg_annotate ann-diff2c.cgout
+post: python3 ../cg_diff --mod-filename="s/.*aux\//aux\//i" --mod-funcname="s/(f[a-z]*)[0-9]/\1N/g" ann-diff2a.cgout ann-diff2b.cgout > ann-diff2c.cgout && python3 ../cg_annotate ann-diff2c.cgout
 cleanup: rm ann-diff2c.cgout
diff --git a/cachegrind/tests/ann-merge1.vgtest b/cachegrind/tests/ann-merge1.vgtest
index 5862828a3f..b0b0eedc96 100644
--- a/cachegrind/tests/ann-merge1.vgtest
+++ b/cachegrind/tests/ann-merge1.vgtest
@@ -2,6 +2,6 @@
 # the post-processing of the `ann{1,1b}.cgout` test files.
 prog: ../../tests/true
 vgopts: --cachegrind-out-file=cachegrind.out
-post: python ../../cachegrind/cg_merge ann-merge1a.cgout ann-merge1b.cgout > ann-merge1c.cgout && python ../../cachegrind/cg_annotate ann-merge1c.cgout
+post: python3 ../cg_merge ann-merge1a.cgout ann-merge1b.cgout > ann-merge1c.cgout && python3 ../cg_annotate ann-merge1c.cgout
 cleanup: rm ann-merge1c.cgout
 
diff --git a/cachegrind/tests/ann1a.vgtest b/cachegrind/tests/ann1a.vgtest
index 1774f1b1c4..740522f6dd 100644
--- a/cachegrind/tests/ann1a.vgtest
+++ b/cachegrind/tests/ann1a.vgtest
@@ -2,5 +2,5 @@
 # the post-processing of the `ann1.cgout` file.
 prog: ../../tests/true
 vgopts: --cachegrind-out-file=cachegrind.out
-post: touch ann1.cgout && python3 ../../cachegrind/cg_annotate --show=Ir,I1mr,ILmr --show-percs=no ann1.cgout
+post: touch ann1.cgout && python3 ../cg_annotate --show=Ir,I1mr,ILmr --show-percs=no ann1.cgout
 cleanup: rm cachegrind.out
diff --git a/cachegrind/tests/ann1b.vgtest b/cachegrind/tests/ann1b.vgtest
index 5eacaa8b10..2b51af9ce3 100644
--- a/cachegrind/tests/ann1b.vgtest
+++ b/cachegrind/tests/ann1b.vgtest
@@ -2,5 +2,5 @@
 # the post-processing of the `ann1.cgout` file.
 prog: ../../tests/true
 vgopts: --cachegrind-out-file=cachegrind.out
-post: touch ann1.cgout && python3 ../../cachegrind/cg_annotate --sort=Dr --show=Dw,Dr,Ir --auto=no ann1.cgout a.c
+post: touch ann1.cgout && python3 ../cg_annotate --sort=Dr --show=Dw,Dr,Ir --auto=no ann1.cgout a.c
 cleanup: rm cachegrind.out
diff --git a/cachegrind/tests/ann2.vgtest b/cachegrind/tests/ann2.vgtest
index b2ec364c72..8a09e28cb4 100644
--- a/cachegrind/tests/ann2.vgtest
+++ b/cachegrind/tests/ann2.vgtest
@@ -8,6 +8,6 @@ vgopts: --cachegrind-out-file=cachegrind.out
 
 # The `sleep` is to ensure the mtime of the second touched file is greater than
 # the mtime of the first touched file.
-post: touch ann2.cgout && sleep 0.1 && touch ann2-more-recent-than-cgout.rs && python3 ../../cachegrind/cg_annotate --context 2 --auto --show-percs=yes --threshold=0.5 -Iann2-no-such-dir --include ann2-no-such-dir-2 -I=ann2-aux ann2.cgout ann2-unmentioned.rs ann2-no-such-file.rs
+post: touch ann2.cgout && sleep 0.1 && touch ann2-more-recent-than-cgout.rs && python3 ../cg_annotate --context 2 --auto --show-percs=yes --threshold=0.5 -Iann2-no-such-dir --include ann2-no-such-dir-2 -I=ann2-aux ann2.cgout ann2-unmentioned.rs ann2-no-such-file.rs
 
 cleanup: rm cachegrind.out