Improve the regression tests.

4 files changed, 21 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index c0ab455..4129a42 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,11 @@ clean:
 
 regress:
 	@echo "Testing deheader: no output is good news."
-	@deheader test >/tmp/regress
+	@deheader -v -v test >/tmp/regress
 	@diff -u test/regress.chk /tmp/regress
 	@rm /tmp/regress 
 makeregress:
-	@deheader test >test/regress.chk
+	@deheader -v -v test >test/regress.chk
 
 pychecker:
 	@ln -f deheader deheader.py
diff --git a/deheader b/deheader
index 3cfbbb6..c2f0c50 100755
--- a/deheader
+++ b/deheader
@@ -191,8 +191,8 @@ def testcompile(source, maker, msg="", verbosity=0):
     else:
         explain = "succeeded"
     if verbosity >= PROGRESS_DEBUG:
-        print "deheader: %s%s %s in %2.2f sec." \
-          % (sourcefile, msg, explain, end-start)
+        print "deheader: %s%s %s." \
+          % (sourcefile, msg, explain)
     return (status, end - start)
 
 def c_analyze(sourcefile, maker, includes, requires, verbosity):
@@ -214,7 +214,7 @@ def c_analyze(sourcefile, maker, includes, requires, verbosity):
                 #    print "%s: checking %s against %s" % (sourcefile, `header`, `requires.pattern`)
                 if requires.pattern and requires.search(header):
                     if verbosity >= PROGRESS_DEBUG:
-                        print "deheader: in %s, retaining required %s" % (souucefile, `header`,)
+                        print "deheader: in %s, retaining required %s" % (sourcefile, `header`,)
                     continue
                 saveit.remove_headers([header])
                 (st, t) = testcompile(sourcefile, maker, " without %s" % trim(header), verbosity)
diff --git a/test/regress.chk b/test/regress.chk
index 4dae4d1..f80d014 100644
--- a/test/regress.chk
+++ b/test/regress.chk
@@ -1,2 +1,9 @@
+deheader: test/string.c requires <string.h>
+deheader: test/umask.c requires <sys/stat.h>
+deheader: test/umask.c requires <sys/types.h>
+test/umask.c has requires <sys/stat.h>|<sys/types.h> from umask
+deheader: test/string.c without <string.h> succeeded.
 deheader: remove <string.h> from test/string.c
-deheader: saw 2 files, 1 includes, 1 removed
+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: saw 3 files, 3 includes, 1 removed
diff --git a/test/umask.c b/test/umask.c
new file mode 100644
index 0000000..ae98c09
--- /dev/null
+++ b/test/umask.c
@@ -0,0 +1,8 @@
+/* this file tests the requirement rules */
+
+#include <sys/stat.h>
+#include <sys/types.h>
+main(int arg, char **argv)
+{
+    umask(777);
+}