Hand off regression testing to a local submakefile.

2 files changed, 84 insertions, 89 deletions

diff --git a/Makefile b/Makefile
index cf2a572..dbe0926 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,9 @@ clean:
 	rm -f *~ *.1 *.html test/*.o test/*~ MANIFEST SHIPPER.*
 
 regress:
-	@echo "Testing deheader: no output is good news."
-	@deheader -v -v test >/tmp/regress
-	@diff -u test/regress.chk /tmp/regress
-	@rm -f test/*.o
-	@rm /tmp/regress 
+	cd test; make --quiet regress
 makeregress:
-	@deheader -v -v test >test/regress.chk
-	@rm -f test/*.o
+	cd test; make --quiet makeregress
 
 pychecker:
 	@ln -f deheader deheader.py
diff --git a/test/regress.chk b/test/regress.chk
index 7ab6389..494b808 100644
--- a/test/regress.chk
+++ b/test/regress.chk
@@ -1,83 +1,83 @@
-deheader: test/string.c includes <string.h>
-deheader: test/duplicate.c includes <stdio.h>
-deheader: test/duplicate.c includes <stdio.h>
-deheader: test/duplicate.c has more than one inclusion of <stdio.h>
-deheader: test/brk.c has requires <unistd.h> from \Wbrk\s*\(
-deheader: test/brk.c includes <unistd.h>
-deheader: test/asinh.c includes <math.h>
-deheader: test/atol.c has requires <stdlib.h> from \Wl64a\s*\(
-deheader: test/atol.c includes <stdlib.h>
-deheader: test/umask.c includes <sys/stat.h>
-deheader: test/umask.c includes <sys/types.h>
-deheader: test/umask.c has requires <sys/stat.h>,<sys/types.h> from \Wumask\s*\(
-deheader: test/a64l.c has requires <stdlib.h> from \Wa64l\s*\(
-deheader: test/a64l.c includes <stdlib.h>
-deheader: test/bcmp.c has requires <string.h> from \Wbcmp\s*\(
-deheader: test/bcmp.c includes <string.h>
-deheader: test/bcopy.c includes <string.h>
-deheader: test/atexit.c includes <stdlib.h>
-deheader: test/abs.c includes <stdlib.h>
-deheader: test/bsd_signal.c includes <signal.h>
-deheader: test/access.c has requires <unistd.h> from \Waccess\s*\(
-deheader: test/access.c includes <unistd.h>
-deheader: test/atoi.c has requires <stdlib.h> from \Wl64a\s*\(
-deheader: test/atoi.c includes <stdlib.h>
-deheader: test/sbrk.c includes <unistd.h>
-deheader: test/alarm.c includes <unistd.h>
-deheader: test/acos.c has requires <math.h> from \Wacos\s*\(
-deheader: test/acos.c includes <math.h>
-deheader: test/abort.c includes <stdlib.h>
-deheader: test/atanh.c has requires <math.h> from \Watanh\s*\(
-deheader: test/atanh.c includes <math.h>
-deheader: test/atof.c has requires <stdlib.h> from \Wl64a\s*\(
-deheader: test/atof.c includes <stdlib.h>
-deheader: test/acosh.c has requires <math.h> from \Wacosh\s*\(
-deheader: test/acosh.c includes <math.h>
-deheader: test/atan.c has requires <math.h> from \Watan\s*\(
-deheader: test/atan.c includes <math.h>
-deheader: test/basename.c has requires <libgen.h> from \Wbasename\s*\(
-deheader: test/basename.c includes <libgen.h>
-deheader: test/asin.c includes <math.h>
-deheader: test/advance.c has requires <regexp.h> from \Wadvance\s*\(
-deheader: test/advance.c includes <regexp.h>
-deheader: test/atan2.c has requires <math.h> from \Watan2\s*\(
-deheader: test/atan2.c includes <math.h>
-deheader: in test/advance.c, retaining required '#include <regexp.h>\n'
-deheader: in test/atof.c, retaining required '#include <stdlib.h>\n'
-deheader: in test/atoi.c, retaining required '#include <stdlib.h>\n'
-deheader: test/asin.c without <math.h> succeeded.
-deheader: remove <math.h> from test/asin.c
-deheader: test/bcopy.c without <string.h> failed (512).
-deheader: in test/access.c, retaining required '#include <unistd.h>\n'
-deheader: in test/a64l.c, retaining required '#include <stdlib.h>\n'
-deheader: test/duplicate.c without <stdio.h> succeeded.
-deheader: test/duplicate.c without <stdio.h> succeeded.
-deheader: remove <stdio.h> from test/duplicate.c
-deheader: remove <stdio.h> from test/duplicate.c
-deheader: in test/umask.c, retaining required '#include <sys/types.h>\n'
-deheader: in test/umask.c, retaining required '#include <sys/stat.h>\n'
-deheader: in test/basename.c, retaining required '#include <libgen.h>\n'
-deheader: test/string.c without <string.h> succeeded.
-deheader: remove <string.h> from test/string.c
-deheader: in test/atol.c, retaining required '#include <stdlib.h>\n'
-deheader: test/alarm.c without <unistd.h> succeeded.
-deheader: remove <unistd.h> from test/alarm.c
-deheader: in test/atanh.c, retaining required '#include <math.h>\n'
-deheader: test/asinh.c without <math.h> succeeded.
-deheader: remove <math.h> from test/asinh.c
-deheader: in test/atan2.c, retaining required '#include <math.h>\n'
-deheader: in test/acosh.c, retaining required '#include <math.h>\n'
-deheader: test/abort.c without <stdlib.h> succeeded.
-deheader: remove <stdlib.h> from test/abort.c
-deheader: in test/brk.c, retaining required '#include <unistd.h>\n'
-deheader: in test/bcmp.c, retaining required '#include <string.h>\n'
-deheader: test/abs.c without <stdlib.h> succeeded.
-deheader: remove <stdlib.h> from test/abs.c
-deheader: test/bsd_signal.c without <signal.h> succeeded.
-deheader: remove <signal.h> from test/bsd_signal.c
-deheader: in test/atan.c, retaining required '#include <math.h>\n'
-deheader: test/atexit.c without <stdlib.h> failed (512).
-deheader: test/sbrk.c without <unistd.h> succeeded.
-deheader: remove <unistd.h> from test/sbrk.c
-deheader: in test/acos.c, retaining required '#include <math.h>\n'
+deheader: ./string.c includes <string.h>
+deheader: ./duplicate.c includes <stdio.h>
+deheader: ./duplicate.c includes <stdio.h>
+deheader: ./duplicate.c has more than one inclusion of <stdio.h>
+deheader: ./brk.c has requires <unistd.h> from \Wbrk\s*\(
+deheader: ./brk.c includes <unistd.h>
+deheader: ./asinh.c includes <math.h>
+deheader: ./atol.c has requires <stdlib.h> from \Wl64a\s*\(
+deheader: ./atol.c includes <stdlib.h>
+deheader: ./umask.c includes <sys/stat.h>
+deheader: ./umask.c includes <sys/types.h>
+deheader: ./umask.c has requires <sys/stat.h>,<sys/types.h> from \Wumask\s*\(
+deheader: ./a64l.c has requires <stdlib.h> from \Wa64l\s*\(
+deheader: ./a64l.c includes <stdlib.h>
+deheader: ./bcmp.c has requires <string.h> from \Wbcmp\s*\(
+deheader: ./bcmp.c includes <string.h>
+deheader: ./bcopy.c includes <string.h>
+deheader: ./atexit.c includes <stdlib.h>
+deheader: ./abs.c includes <stdlib.h>
+deheader: ./bsd_signal.c includes <signal.h>
+deheader: ./access.c has requires <unistd.h> from \Waccess\s*\(
+deheader: ./access.c includes <unistd.h>
+deheader: ./atoi.c has requires <stdlib.h> from \Wl64a\s*\(
+deheader: ./atoi.c includes <stdlib.h>
+deheader: ./sbrk.c includes <unistd.h>
+deheader: ./alarm.c includes <unistd.h>
+deheader: ./acos.c has requires <math.h> from \Wacos\s*\(
+deheader: ./acos.c includes <math.h>
+deheader: ./abort.c includes <stdlib.h>
+deheader: ./atanh.c has requires <math.h> from \Watanh\s*\(
+deheader: ./atanh.c includes <math.h>
+deheader: ./atof.c has requires <stdlib.h> from \Wl64a\s*\(
+deheader: ./atof.c includes <stdlib.h>
+deheader: ./acosh.c has requires <math.h> from \Wacosh\s*\(
+deheader: ./acosh.c includes <math.h>
+deheader: ./atan.c has requires <math.h> from \Watan\s*\(
+deheader: ./atan.c includes <math.h>
+deheader: ./basename.c has requires <libgen.h> from \Wbasename\s*\(
+deheader: ./basename.c includes <libgen.h>
+deheader: ./asin.c includes <math.h>
+deheader: ./advance.c has requires <regexp.h> from \Wadvance\s*\(
+deheader: ./advance.c includes <regexp.h>
+deheader: ./atan2.c has requires <math.h> from \Watan2\s*\(
+deheader: ./atan2.c includes <math.h>
+deheader: in ./atan2.c, retaining required '#include <math.h>\n'
+deheader: ./asin.c without <math.h> succeeded.
+deheader: remove <math.h> from ./asin.c
+deheader: in ./acos.c, retaining required '#include <math.h>\n'
+deheader: in ./brk.c, retaining required '#include <unistd.h>\n'
+deheader: ./string.c without <string.h> succeeded.
+deheader: remove <string.h> from ./string.c
+deheader: ./bsd_signal.c without <signal.h> succeeded.
+deheader: remove <signal.h> from ./bsd_signal.c
+deheader: ./abs.c without <stdlib.h> succeeded.
+deheader: remove <stdlib.h> from ./abs.c
+deheader: in ./basename.c, retaining required '#include <libgen.h>\n'
+deheader: ./atexit.c without <stdlib.h> failed (512).
+deheader: in ./atan.c, retaining required '#include <math.h>\n'
+deheader: ./duplicate.c without <stdio.h> succeeded.
+deheader: ./duplicate.c without <stdio.h> succeeded.
+deheader: remove <stdio.h> from ./duplicate.c
+deheader: remove <stdio.h> from ./duplicate.c
+deheader: in ./atanh.c, retaining required '#include <math.h>\n'
+deheader: ./bcopy.c without <string.h> failed (512).
+deheader: in ./atol.c, retaining required '#include <stdlib.h>\n'
+deheader: in ./atoi.c, retaining required '#include <stdlib.h>\n'
+deheader: ./asinh.c without <math.h> succeeded.
+deheader: remove <math.h> from ./asinh.c
+deheader: ./alarm.c without <unistd.h> succeeded.
+deheader: remove <unistd.h> from ./alarm.c
+deheader: ./sbrk.c without <unistd.h> succeeded.
+deheader: remove <unistd.h> from ./sbrk.c
+deheader: in ./umask.c, retaining required '#include <sys/types.h>\n'
+deheader: in ./umask.c, retaining required '#include <sys/stat.h>\n'
+deheader: ./abort.c without <stdlib.h> succeeded.
+deheader: remove <stdlib.h> from ./abort.c
+deheader: in ./access.c, retaining required '#include <unistd.h>\n'
+deheader: in ./atof.c, retaining required '#include <stdlib.h>\n'
+deheader: in ./acosh.c, retaining required '#include <math.h>\n'
+deheader: in ./bcmp.c, retaining required '#include <string.h>\n'
+deheader: in ./a64l.c, retaining required '#include <stdlib.h>\n'
+deheader: in ./advance.c, retaining required '#include <regexp.h>\n'
 deheader: saw 27 files, 28 includes, 10 removed