From 651364d764d3c75380adf9498e33069fcb10a641 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 1 Jan 2020 15:19:21 +0000 Subject: [PATCH] Makefiles: Rename test executables to end in .trun Having these end in -test makes it hard to talk about them en masse without including handwritten stuff. Signed-off-by: Ian Jackson --- .gitignore | 4 ++-- Dir.sd.mk | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 761332a..03c35c1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ pubkeys.fl pubkeys.yy.[ch] /version.c /secnet -/eax-*-test +/eax-*.trun /eax-*-test.confirm /ipaddrset-test.new /ipaddrset.confirm @@ -21,7 +21,7 @@ Makefile /common.make /test-common.make -msgcode-test +msgcode.trun msgcode-test.confirm autom4te.cache diff --git a/Dir.sd.mk b/Dir.sd.mk index baabaf6..507235f 100644 --- a/Dir.sd.mk +++ b/Dir.sd.mk @@ -155,19 +155,19 @@ version.c: FORCE echo "char version[]=\"secnet $$v\";" >>$@.new mv -f $@.new $@ -eax-%-test: eax-%-test.o eax-test.o %.o +eax-%.trun: eax-%-test.o eax-test.o %.o $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^ -eax-%-test.confirm: eax-%-test eax-%-test.vectors +eax-%-test.confirm: eax-%.trun eax-%-test.vectors ./$< <$(srcdir)/eax-$*-test.vectors >$@.new mv -f $@.new $@ &CDEPS_OBJECTS += msgcode-test.o -msgcode-test: msgcode-test.o +msgcode.trun: msgcode-test.o $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^ -msgcode-test.confirm: msgcode-test +msgcode-test.confirm: msgcode.trun ./msgcode-test touch $@ @@ -181,7 +181,7 @@ ipaddrset.confirm: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected pubkeys.fl: ${srcdir}/pubkeys.fl.pl ${srcdir}/pubkeys.fl.pl >$@.tmp && mv -f $@.tmp $@ -.PRECIOUS: eax-%-test +.PRECIOUS: eax-%.trun installdirs: $(INSTALL) -d $(prefix)/share/secnet $(sbindir) @@ -215,9 +215,9 @@ install-force: clean:: $(RM) -f *.o *.yy.[ch] *.tab.[ch] core version.c - $(RM) -f *.pyc *~ eax-*-test.confirm eax-*-test + $(RM) -f *.pyc *~ eax-*-test.confirm eax-*.trun $(RM) -rf __pycache__ - $(RM) -f msgcode-test.confirm msgcode-test + $(RM) -f msgcode-test.confirm msgcode.trun realclean:: clean $(RM) -f *~ Makefile config.h \ -- 2.30.2