Rename `ann-diff` test as `ann-diff1`.

To make room for another test.

diff --git a/cachegrind/tests/Makefile.am b/cachegrind/tests/Makefile.am
index cee1f29167634ed403fc2df2b311fff77d6efcae..33baeeea69ace32d40c032dace0967cfdddad478 100644 (file)
--- a/cachegrind/tests/Makefile.am
+++ b/cachegrind/tests/Makefile.am
@@ -13,7 +13,7 @@ dist_noinst_SCRIPTS = filter_stderr filter_cachesim_discards
 # Note that `test.c` and `a.c` are not compiled.
 # They just serve as input for cg_annotate in `ann1a` and `ann1b`.
 EXTRA_DIST = \
-       ann-diff.post.exp ann-diff.stderr.exp ann-diff.vgtest \
+       ann-diff1.post.exp ann-diff1.stderr.exp ann-diff1.vgtest \
        ann1a.post.exp ann1a.stderr.exp ann1a.vgtest ann1.cgout \
        ann1b.post.exp ann1b.stderr.exp ann1b.vgtest ann1b.cgout \
        ann2.post.exp ann2.stderr.exp ann2.vgtest ann2.cgout \

diff --git a/cachegrind/tests/ann-diff.post.exp b/cachegrind/tests/ann-diff1.post.exp
similarity index 98%
rename from cachegrind/tests/ann-diff.post.exp
rename to cachegrind/tests/ann-diff1.post.exp
index 9f8f276ff1e1b9fb149f6249a14b03f6bc0bdd5e..2d7d61ac709b58db538cbbb0b32ab83bb040b352 100644 (file)
--- a/cachegrind/tests/ann-diff.post.exp
+++ b/cachegrind/tests/ann-diff1.post.exp
@@ -3,7 +3,7 @@
 --------------------------------------------------------------------------------
 Files compared:   ann1.cgout; ann1b.cgout
 Command:          ./a.out; ./a.out
-Data file:        ann-diff.cgout
+Data file:        ann-diff1.cgout
 Events recorded:  Ir I1mr ILmr Dr D1mr DLmr Dw D1mw DLmw
 Events shown:     Ir I1mr ILmr Dr D1mr DLmr Dw D1mw DLmw
 Event sort order: Ir I1mr ILmr Dr D1mr DLmr Dw D1mw DLmw

diff --git a/cachegrind/tests/ann-diff.stderr.exp b/cachegrind/tests/ann-diff1.stderr.exp
similarity index 100%
rename from cachegrind/tests/ann-diff.stderr.exp
rename to cachegrind/tests/ann-diff1.stderr.exp

diff --git a/cachegrind/tests/ann-diff.vgtest b/cachegrind/tests/ann-diff1.vgtest
similarity index 74%
rename from cachegrind/tests/ann-diff.vgtest
rename to cachegrind/tests/ann-diff1.vgtest
index e3dc0992e04be18b97f0f9832098229216bc4023..ce3e216c66fce00412a736c8c79eecd940215b60 100644 (file)
--- a/cachegrind/tests/ann-diff.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: perl ../../cachegrind/cg_diff ann1.cgout ann1b.cgout > ann-diff.cgout && perl ../../cachegrind/cg_annotate ann-diff.cgout
-cleanup: rm ann-diff.cgout
+post: perl ../../cachegrind/cg_diff ann1.cgout ann1b.cgout > ann-diff1.cgout && perl ../../cachegrind/cg_annotate ann-diff1.cgout
+cleanup: rm ann-diff1.cgout