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 b737b713e3d2dab8f236cb69e3d3d6e1b1e61fa6..e3794018769712d3d83d5736c0d4246aab125e48 100644 (file)
--- 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 101cac07d14ad344c9d2092ad6c9e69dc13920aa..7b395e4e48e7c6a7a610b39c6c1e5336440b26d0 100644 (file)
--- 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 5862828a3f4096f7d2eb3fc210ace2456ee20f96..b0b0eedc96a96d9da8ad49ed718f7b7d736ce4f0 100644 (file)
--- 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 1774f1b1c473fa1eb1b53144d34c691493e95ce2..740522f6ddd21721319b2862cce542519121baf8 100644 (file)
--- 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 5eacaa8b109b2743a15621cb0a4893d19d58c6dc..2b51af9ce3574d9e2bb8683210e8732d7b1845b2 100644 (file)
--- 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 b2ec364c7279da2eb5a7da22824b336f673ac05c..8a09e28cb40719b6d10ca5809b2d79f2cb173bf0 100644 (file)
--- 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