Extremely basic 'bup server' support.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 802e32a7b2e7d8ad5cdab0e5122777eebcf72421..e19cd3b00215ef75a82e2f73a4186f073c2d12a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CFLAGS=-Wall -g -O2 -Werror -I/usr/include/python2.5 -g -fPIC
 
 default: all
 
-all: bup-split bup-join bup-save bup-init bup randomgen chashsplit.so
+all: bup-split bup-join bup-save bup-init bup-server bup randomgen chashsplit.so
 
 randomgen: randomgen.o
 
@@ -13,22 +13,7 @@ runtests: all
        ./wvtest.py $(wildcard t/t*.py)
        
 runtests-cmdline: all
-       @echo "Testing \"$@\" in Makefile:"
-       ./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.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-sh
        
 test: all runtests-cmdline
        ./wvtestrun $(MAKE) runtests
@@ -53,5 +38,6 @@ bup-%: cmd-%.sh
 
 clean:
        rm -f *.o *.so *~ .*~ *.pyc */*.pyc */*~ \
-               bup bup-split bup-join bup-save bup-init randomgen \
-               out[12] out2[tc] tags[12] tags2[tc] *.tmp
+               bup bup-* randomgen \
+               out[12] out2[tc] tags[12] tags2[tc]
+       rm -rf *.tmp