Name temp files from 'make test' as *.tmp to make them easier to clean.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index ae2924baa60742559da6cfbbd90af452edfdbbb2..a61b0ece0edcd5b97eb1cf5f4777034d64cdb44a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@ CFLAGS=-Wall -g -O2 -Werror -I/usr/include/python2.5 -g -fPIC
 
 default: all
 
-all: bup-split bup-join bup randomgen hashsplit.so
+all: bup-split bup-join bup-save bup randomgen chashsplit.so
 
 randomgen: randomgen.o
 
-hashsplit.so: hashsplitmodule.o
+chashsplit.so: chashsplitmodule.o
        $(CC) -shared -o $@ $<
        
 runtests: all
@@ -14,15 +14,21 @@ runtests: all
        
 runtests-cmdline: all
        @echo "Testing \"$@\" in Makefile:"
-       ./bup split -b <testfile1 >tags1
-       ./bup split -b <testfile2 >tags2
-       diff -u tags1 tags2 || true
+       ./bup split --bench -b <testfile1 >tags1.tmp
+       ./bup split -vvvv -b testfile2 >tags2.tmp
+       ./bup split -t testfile2 >tags2t.tmp
+       ./bup split -c testfile2 >tags2c.tmp
+       diff -u tags1.tmp tags2.tmp || true
        wc -c testfile1 testfile2
-       wc -l tags1 tags2
-       ./bup join <tags1 >out1
-       ./bup join <tags2 >out2
-       diff -u testfile1 out1
-       diff -u testfile2 out2
+       wc -l tags1.tmp tags2.tmp
+       ./bup join $$(cat tags1.tmp) >out1.tmp
+       ./bup join <tags2.tmp >out2.tmp
+       ./bup join <tags2t.tmp >out2t.tmp
+       ./bup join <tags2c.tmp >out2c.tmp
+       diff -u testfile1 out1.tmp
+       diff -u testfile2 out2.tmp
+       diff -u testfile2 out2t.tmp
+       diff -u testfile2 out2c.tmp
        
 test: all runtests-cmdline
        ./wvtestrun $(MAKE) runtests
@@ -46,6 +52,6 @@ bup-%: cmd-%.sh
        gcc -c -o $@ $^ $(CPPFLAGS) $(CFLAGS)
 
 clean:
-       rm -f *.o *.so *~ .*~ *.pyc \
-               bup bup-split bup-join randomgen \
-               out[12] tags[12]
+       rm -f *.o *.so *~ .*~ *.pyc */*.pyc */*~ \
+               bup bup-split bup-join bup-save randomgen \
+               out[12] out2[tc] tags[12] tags2[tc] *.tmp