From: Robert Edmonds <edmonds@debian.org>
Date: Sat, 14 Mar 2015 19:33:15 +0000 (-0400)
Subject: Merge tag '0.27-rc3' into debian
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8dccdef72d2533de50e6b8126a3a5ae0a80e0696;p=packages%2Fb%2Fbup.git

Merge tag '0.27-rc3' into debian

0.27-rc3

Conflicts:
	Makefile
---

8dccdef72d2533de50e6b8126a3a5ae0a80e0696
diff --cc Makefile
index eac83b7,181d42c..ee34f84
--- a/Makefile
+++ b/Makefile
@@@ -1,5 -1,6 +1,6 @@@
  OS:=$(shell uname | sed 's/[-_].*//')
 -CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
 +CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+ CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
  SOEXT:=.so
  
  ifeq ($(OS),CYGWIN)
@@@ -12,12 -13,13 +13,13 @@@ els
    test_tmp := $(CURDIR)/t/tmp
  endif
  
- default: all
- 
+ .PHONY: all
 -all: bup Documentation/all
 +all: bup
  	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 -s main.py bup
+ 	test -L bup
  
  Documentation/all: bup
  
@@@ -74,41 -76,54 +76,54 @@@ 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
- 	./debian/gen_version_py.sh >$@.new
- 	mv $@.new $@
+ 	rm -f $@.tmp-$$$$ \
 -	&& ./format-subst.pl $@.pre > $@.tmp-$$$$ \
++	&& ./debian/gen_version_py.sh > $@.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-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-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
+ 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