All three tests work now.

diff --git a/makefile b/makefile
index dc84084f5abe46a6588539e2ba80c051aa323460..0a92d4e6304c90544e3d5adcf6f85de0cbc0ab25 100644 (file)
--- a/makefile
+++ b/makefile
@@ -3,10 +3,12 @@
 
 include Makefile
 
-# Test that making several hash files at one go doesn't mess up. 
+# These test trees should be nontrivial but not huge.
 UNIX = /home/esr/src/unix
-SRC1  = net2
-SRC2  = src5r4
+SRC1  = sys3
+SRC2  = 32v
+
+# Test that making several hash files at one go doesn't mess up. 
 regress2:
        comparator -C -d $(UNIX) $(SRC1) | dumpscf >test1-old.dump
        comparator -C -d $(UNIX) $(SRC2) | dumpscf >test2-old.dump
@@ -16,5 +18,13 @@ regress2:
        diff -u test1-old.dump test1.dump
        diff -u test2-old.dump test2.dump
 
-blackspot.ovl:
-       time comparator -v -C -d $(UNIX) src5r4 linux-2.4.19 >blackspot.ovl
+# Test that making a report from SCF files works the same as from the trees
+regress3:
+       comparator -C -d $(UNIX) $(SRC1) $(SRC2) >test1.dump
+       comparator -C -c -d $(UNIX) $(SRC1) $(SRC2)
+       comparator $(SRC1).scf $(SRC2).scf >test2.dump
+       diff -u test1.dump test2.dump
+
+# Test SVr4 against Linux
+sco.ovl:
+       time comparator -v -C -d $(UNIX) src5r4 linux-2.4.19 >sco.ovl