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 201b967d1dfe23dba7b96ea727a35cb0e9e76e58..1c68fc95c28f63d0981b0d10066656aa5f7a184f 100644 (file)
--- 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 3c53e1f55e99f07cfb8981914a614e0a6fb567ce..6b355ef74148cee9a74a703f26af287c20859d53 100644 (file)
--- 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 47e56360382372c2847c810f0c381821ebfc39bb..3f6f17f6a3caa914c34c6155ee2f909a26dad006 100644 (file)
--- 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 9b7dffa0f06460607146daf210ca2d7f84aa61b1..9a4a5655910df8b03fcead697000b05095982a52 100644 (file)
--- 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