cleanup-mounts-under: Don't fail when /proc/mounts isn't readable

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 0fe347550d063e1c5b531afbcdbdcf057b23b703..e522355cf21ba7418ed789149b24a7c0aee43699 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 OS:=$(shell uname | sed 's/[-_].*//')
-CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(OS),CYGWIN)
@@ -88,17 +89,27 @@ runtests-python: all
 
 runtests-cmdline: all
        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-restore-exclude-rx.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:
@@ -167,10 +178,10 @@ clean: Documentation/clean config/clean
                .*~ *~ */*~ 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
-       umount t/mnt/* || true
+       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