X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=a024dbeef1135db8e47f7b5e8c0522847d5b7ebd;hb=5eaca519f7243d2f19e64a5c671316507628f450;hp=d8b19b55c8d00dfb3be3a94a77a8e3f38798e54a;hpb=b0fbd0da35ed132874848cf31a1c8294aee4476c;p=bup.git

diff --git a/Makefile b/Makefile
index d8b19b5..a024dbe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 OS:=$(shell uname | sed 's/[-_].*//')
 CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(OS),CYGWIN)
@@ -12,12 +13,12 @@ else
   test_tmp := $(CURDIR)/t/tmp
 endif
 
-default: all
-
+.PHONY: all
 all: bup Documentation/all
 	t/configure-sampledata --setup
 
-bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
+bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds main.py
+	ln -sf main.py bup
 
 Documentation/all: bup
 
@@ -74,52 +75,63 @@ lib/bup/_helpers$(SOEXT): \
 	LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" $(PYTHON) csetup.py build
 	cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
 
+# This must be completely atomic since it may be run (often) in
+# parallel when "-j" is specified, either via targets here, or via
+# tests that use an install tree as data.
 .PHONY: lib/bup/_version.py
 lib/bup/_version.py:
-	rm -f $@ $@.new
-	./format-subst.pl $@.pre >$@.new
-	mv $@.new $@
+	rm -f $@.tmp-$$$$ \
+	&& ./format-subst.pl $@.pre > $@.tmp-$$$$ \
+	&& (if ! test -e $@ || ! cmp $@ $@.tmp-$$$$; then mv $@.tmp-$$$$ $@; fi) \
+	&& rm -f $@.tmp-$$$$
+
+t/tmp:
+	mkdir t/tmp
 
-runtests: all runtests-python runtests-cmdline
+runtests: runtests-python runtests-cmdline
 
-runtests-python: all
-	test -e t/tmp || mkdir t/tmp
+runtests-python: all t/tmp
 	TMPDIR="$(test_tmp)" $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
 
-runtests-cmdline: all
-	test -e t/tmp || mkdir t/tmp
-	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-command-without-init-fails.sh
-	TMPDIR="$(test_tmp)" t/test-redundant-saves.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
+cmdline_tests := \
+  t/test-fuse.sh \
+  t/test-drecurse.sh \
+  t/test-cat-file.sh \
+  t/test-compression.sh \
+  t/test-fsck.sh \
+  t/test-index-clear.sh \
+  t/test-index-check-device.sh \
+  t/test-ls.sh \
+  t/test-meta.sh \
+  t/test-on.sh \
+  t/test-restore-map-owner.sh \
+  t/test-restore-single-file.sh \
+  t/test-rm-between-index-and-save.sh \
+  t/test-sparse-files.sh \
+  t/test-command-without-init-fails.sh \
+  t/test-redundant-saves.sh \
+  t/test-save-creates-no-unrefs.sh \
+  t/test-save-restore-excludes.sh \
+  t/test-save-strip-graft.sh \
+  t/test-import-duplicity.sh \
+  t/test-import-rdiff-backup.sh \
+  t/test-xdev.sh \
+  t/test.sh
+
+# For parallel runs.
+tmp-target-run-test-%: all t/tmp
+	TMPDIR="$(test_tmp)" t/test-$*
+
+runtests-cmdline: $(subst t/test-,tmp-target-run-test-,$(cmdline_tests))
 
 stupid:
 	PATH=/bin:/usr/bin $(MAKE) test
 
 test: all
-	./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests
+	./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests-python runtests-cmdline
 
 check: test
 
-bup: main.py
-	rm -f $@
-	ln -s $< $@
-
 cmds: \
     $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
     $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
@@ -128,14 +140,6 @@ cmd/bup-%: cmd/%-cmd.py
 	rm -f $@
 	ln -s $*-cmd.py $@
 
-%: %.py
-	rm -f $@
-	ln -s $< $@
-
-bup-%: cmd-%.sh
-	rm -f $@
-	ln -s $< $@
-
 cmd/bup-%: cmd/%-cmd.sh
 	rm -f $@
 	ln -s $*-cmd.sh $@
@@ -149,13 +153,13 @@ export-docs: Documentation/all
 	rm -f $${GIT_INDEX_FILE} && \
 	git add -f Documentation/*.1 && \
 	git update-ref refs/heads/man \
-		$$(echo "Autogenerated man pages for $$(git describe)" \
+		$$(echo "Autogenerated man pages for $$(git describe --always)" \
 		    | git commit-tree $$(git write-tree --prefix=Documentation) \
 				-p refs/heads/man) && \
 	rm -f $${GIT_INDEX_FILE} && \
 	git add -f Documentation/*.html && \
 	git update-ref refs/heads/html \
-		$$(echo "Autogenerated html pages for $$(git describe)" \
+		$$(echo "Autogenerated html pages for $$(git describe --always)" \
 		    | git commit-tree $$(git write-tree --prefix=Documentation) \
 				-p refs/heads/html)
 
@@ -173,18 +177,16 @@ 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 \
+		bup bup-* cmd/bup-* \
+		lib/bup/_version.py lib/bup/_version.py.tmp-* \
+		randomgen memtest \
 		testfs.img lib/bup/t/testfs.img
 	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