test-cat-file.sh: handle hashsplit bupm files

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 2069099e91d7253f7f5c17bae5f87071f1fe0a64..e522355cf21ba7418ed789149b24a7c0aee43699 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,22 @@
 OS:=$(shell uname | sed 's/[-_].*//')
-CFLAGS:=-Wall -O2 -Werror $(PYINCLUDE)
+CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(OS),CYGWIN)
   SOEXT:=.dll
 endif
 
+ifdef TMPDIR
+  test_tmp := $(TMPDIR)
+else
+  test_tmp := $(CURDIR)/t/tmp
+endif
+
 default: all
 
 all: bup Documentation/all
+       t/configure-sampledata --setup
 
 bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
 
@@ -16,13 +24,14 @@ Documentation/all: bup
 
 INSTALL=install
 PYTHON=python
-MANDIR=$(DESTDIR)/usr/share/man
-DOCDIR=$(DESTDIR)/usr/share/doc/bup
-BINDIR=$(DESTDIR)/usr/bin
-LIBDIR=$(DESTDIR)/usr/lib/bup
+PREFIX=/usr
+MANDIR=$(DESTDIR)$(PREFIX)/share/man
+DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
+BINDIR=$(DESTDIR)$(PREFIX)/bin
+LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
 install: all
        $(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
-               $(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
+               $(LIBDIR)/bup $(LIBDIR)/cmd \
                $(LIBDIR)/web $(LIBDIR)/web/static
        [ ! -e Documentation/.docs-available ] || \
          $(INSTALL) -m 0644 \
@@ -32,23 +41,20 @@ install: all
          $(INSTALL) -m 0644 \
                Documentation/*.html \
                $(DOCDIR)
-       $(INSTALL) -m 0755 bup $(BINDIR)
-       $(INSTALL) -m 0755 \
+       $(INSTALL) -pm 0755 bup $(BINDIR)
+       $(INSTALL) -pm 0755 \
                cmd/bup-* \
                $(LIBDIR)/cmd
-       $(INSTALL) -m 0644 \
+       $(INSTALL) -pm 0644 \
                lib/bup/*.py \
                $(LIBDIR)/bup
-       $(INSTALL) -m 0755 \
+       $(INSTALL) -pm 0755 \
                lib/bup/*$(SOEXT) \
                $(LIBDIR)/bup
-       $(INSTALL) -m 0644 \
-               lib/tornado/*.py \
-               $(LIBDIR)/tornado
-       $(INSTALL) -m 0644 \
+       $(INSTALL) -pm 0644 \
                lib/web/static/* \
                $(LIBDIR)/web/static/
-       $(INSTALL) -m 0644 \
+       $(INSTALL) -pm 0644 \
                lib/web/*.html \
                $(LIBDIR)/web/
 %/all:
@@ -57,10 +63,16 @@ install: all
 %/clean:
        $(MAKE) -C $* clean
 
+config/config.h: config/Makefile config/configure config/configure.inc \
+               $(wildcard config/*.in)
+       cd config && $(MAKE) config.h
+
 lib/bup/_helpers$(SOEXT): \
+               config/config.h \
                lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
        @rm -f $@
-       cd lib/bup && LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" $(PYTHON) csetup.py build
+       cd lib/bup && \
+       LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" $(PYTHON) csetup.py build
        cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
 
 .PHONY: lib/bup/_version.py
@@ -71,12 +83,34 @@ lib/bup/_version.py:
 
 runtests: all runtests-python runtests-cmdline
 
-runtests-python:
-       $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
+runtests-python: all
+       test -e t/tmp || mkdir t/tmp
+       TMPDIR="$(test_tmp)" $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
 
 runtests-cmdline: all
-       t/test.sh
-       t/test-meta.sh
+       test -e t/tmp || mkdir t/tmp
+       TMPDIR="$(test_tmp)" t/test-fuse.sh
+       TMPDIR="$(test_tmp)" t/test-drecurse.sh
+       TMPDIR="$(test_tmp)" t/test-cat-file.sh
+       TMPDIR="$(test_tmp)" t/test-compression.sh
+       TMPDIR="$(test_tmp)" t/test-fsck.sh
+       TMPDIR="$(test_tmp)" t/test-index-clear.sh
+       TMPDIR="$(test_tmp)" t/test-index-check-device.sh
+       TMPDIR="$(test_tmp)" t/test-ls.sh
+       TMPDIR="$(test_tmp)" t/test-meta.sh
+       TMPDIR="$(test_tmp)" t/test-on.sh
+       TMPDIR="$(test_tmp)" t/test-restore-map-owner.sh
+       TMPDIR="$(test_tmp)" t/test-restore-single-file.sh
+       TMPDIR="$(test_tmp)" t/test-rm-between-index-and-save.sh
+       TMPDIR="$(test_tmp)" t/test-sparse-files.sh
+       TMPDIR="$(test_tmp)" t/test-command-without-init-fails.sh
+       TMPDIR="$(test_tmp)" t/test-redundant-saves.sh
+       TMPDIR="$(test_tmp)" t/test-save-creates-no-unrefs.sh
+       TMPDIR="$(test_tmp)" t/test-save-restore-excludes.sh
+       TMPDIR="$(test_tmp)" t/test-save-strip-graft.sh
+       TMPDIR="$(test_tmp)" t/test-import-rdiff-backup.sh
+       TMPDIR="$(test_tmp)" t/test-xdev.sh
+       TMPDIR="$(test_tmp)" t/test.sh
 
 stupid:
        PATH=/bin:/usr/bin $(MAKE) test
@@ -139,13 +173,22 @@ import-docs: Documentation/clean
        git archive origin/html | (cd Documentation; tar -xvf -)
        git archive origin/man | (cd Documentation; tar -xvf -)
 
-clean: Documentation/clean
-       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll *.exe \
+clean: Documentation/clean config/clean
+       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
                bup bup-* cmd/bup-* lib/bup/_version.py randomgen memtest \
-               out[12] out2[tc] tags[12] tags2[tc] \
                testfs.img lib/bup/t/testfs.img
-       rm -rf *.tmp t/*.tmp lib/*/*/*.tmp build lib/bup/build
-       if test -e testfs; then rmdir testfs; fi
-       if test -e lib/bup/t/testfs; then rmdir lib/bup/t/testfs; fi
+       if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
+       if test -e t/mnt; then rm -r t/mnt; fi
+       if test -e t/tmp; then t/cleanup-mounts-under t/tmp; fi
+        # FIXME: migrate these to t/mnt/
+       if test -e bupmeta.tmp/testfs; \
+         then umount bupmeta.tmp/testfs || true; fi
+       if test -e lib/bup/t/testfs; \
+         then umount lib/bup/t/testfs || true; fi
+       if test -e bupmeta.tmp/testfs-limited; \
+         then umount bupmeta.tmp/testfs-limited || true; fi
+       rm -rf *.tmp *.tmp.meta t/*.tmp lib/*/*/*.tmp build lib/bup/build lib/bup/t/testfs
+       if test -e t/tmp; then t/force-delete t/tmp; fi
+       t/configure-sampledata --clean