Makefiles: Rename test stamp files to .tconfirm (from .confirm)

This seems to go with .trun and will make talking about them in
patterns etc. a bit more principled.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/.gitignore b/.gitignore
index 03c35c13b1d65125e1d1c39ade8834acd619d2b6..b89fa55ab89797eb084bd70a968b0d95210c30d6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,9 @@ pubkeys.yy.[ch]
 /version.c
 /secnet
 /eax-*.trun
-/eax-*-test.confirm
+/eax-*.tconfirm
 /ipaddrset-test.new
-/ipaddrset.confirm
+/ipaddrset.tconfirm
 
 /config.log
 /config.h
@@ -22,7 +22,7 @@ Makefile
 /test-common.make
 
 msgcode.trun
-msgcode-test.confirm
+msgcode.tconfirm
 
 autom4te.cache
 

diff --git a/Dir.sd.mk b/Dir.sd.mk
index 507235f04bc16d521ffd7f4057e3f706ff15a552..6d2aa412fa83ed71746abdcbaec77b281b2b2682 100644 (file)
--- a/Dir.sd.mk
+++ b/Dir.sd.mk
@@ -122,11 +122,11 @@ endif
 
 TESTDIRS=stest mtest
 
-&TARGETS_check = eax-aes-test.confirm eax-serpent-test.confirm \
-       eax-serpentbe-test.confirm ipaddrset.confirm
+&TARGETS_check = eax-aes.tconfirm eax-serpent.tconfirm \
+       eax-serpentbe.tconfirm ipaddrset.tconfirm
 
 &TARGETS_fullcheck += $(&TARGETS_check)
-&TARGETS_fullcheck += msgcode-test.confirm
+&TARGETS_fullcheck += msgcode.tconfirm
 
 RECHECK_RM += $(&TARGETS_check)
 RECHECK_RM += $(addsuffix /d-*, $(TESTDIRS));
@@ -158,7 +158,7 @@ version.c: FORCE
 eax-%.trun: eax-%-test.o eax-test.o %.o
        $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
 
-eax-%-test.confirm: eax-%.trun eax-%-test.vectors
+eax-%.tconfirm: eax-%.trun eax-%-test.vectors
        ./$< <$(srcdir)/eax-$*-test.vectors >$@.new
        mv -f $@.new $@
 
@@ -167,11 +167,11 @@ eax-%-test.confirm: eax-%.trun eax-%-test.vectors
 msgcode.trun: msgcode-test.o
        $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
 
-msgcode-test.confirm: msgcode.trun
-       ./msgcode-test
+msgcode.tconfirm: msgcode.trun
+       ./msgcode.trun
        touch $@
 
-ipaddrset.confirm: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
+ipaddrset.tconfirm: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
        $(srcdir)/ipaddrset-test.py >ipaddrset-test.new
        diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
        touch $@
@@ -215,9 +215,9 @@ install-force:
 
 clean::
        $(RM) -f *.o *.yy.[ch] *.tab.[ch] core version.c
-       $(RM) -f *.pyc *~ eax-*-test.confirm eax-*.trun
+       $(RM) -f *.pyc *~ eax-*.tconfirm eax-*.trun
        $(RM) -rf __pycache__
-       $(RM) -f msgcode-test.confirm msgcode.trun
+       $(RM) -f msgcode.tconfirm msgcode.trun
 
 realclean::    clean
        $(RM) -f *~ Makefile config.h \