X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=e45719d6118027d5d841c31370920dfdd07ea710;hb=63c1a8c02851b74309676588123d49710e1ecb29;hp=6ea5207ba9bf1b9514b561b3a79d64e1b97476a4;hpb=b704ef04c67a6bf7b064d7b7098afc058a0ac532;p=bup.git

diff --git a/Makefile b/Makefile
index 6ea5207..e45719d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 
+MAKEFLAGS += --warn-undefined-variables
+
 SHELL := bash
 .DEFAULT_GOAL := all
 
 # See config/config.vars.in (sets bup_python, among other things)
-include config/config.vars
+-include config/config.vars
 
 pf := set -o pipefail
+cfg_py := $(CURDIR)/config/bin/python
 
 define isok
   && echo " ok" || echo " no"
@@ -16,17 +19,18 @@ define shout
 $(if $(subst ok,,$(lastword $(1))),$(error $(2)),$(shell x="$(1)"; echo $${x%???}))
 endef
 
-sampledata_rev := $(shell t/configure-sampledata --revision $(isok))
+sampledata_rev := $(shell dev/configure-sampledata --revision $(isok))
 sampledata_rev := \
   $(call shout,$(sampledata_rev),Could not parse sampledata revision)
 
-current_sampledata := t/sampledata/var/rev/v$(sampledata_rev)
+current_sampledata := test/sampledata/var/rev/v$(sampledata_rev)
 
 os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
 os := $(call shout,$(os),Unable to determine OS)
 
-CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
-CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
+CFLAGS := -O2 -Wall -Werror -Wformat=2 $(CFLAGS)
+CFLAGS := -Wno-unknown-pragmas -Wsign-compare $(CFLAGS)
+CFLAGS := -D_FILE_OFFSET_BITS=64 $(PYINCLUDE) $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(os),CYGWIN)
@@ -36,35 +40,49 @@ endif
 ifdef TMPDIR
   test_tmp := $(TMPDIR)
 else
-  test_tmp := $(CURDIR)/t/tmp
+  test_tmp := $(CURDIR)/test/tmp
 endif
 
-initial_setup := $(shell ./configure-version --update $(isok))
-initial_setup := $(call shout,$(initial_setup),Version configuration failed))
+initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
+initial_setup := $(call shout,$(initial_setup),update-checkout-info failed))
 
-config/config.vars: configure config/configure config/configure.inc \
+config/config.vars: \
+  configure config/configure config/configure.inc \
   $(wildcard config/*.in)
 	MAKE="$(MAKE)" ./configure
 
-bup_cmds := cmd/bup-python \
+# On some platforms, Python.h and readline.h fight over the
+# _XOPEN_SOURCE version, i.e. -Werror crashes on a mismatch, so for
+# now, we're just going to let Python's version win.
+
+ifneq ($(strip $(bup_readline_cflags)),)
+  readline_cflags += $(bup_readline_cflags)
+  readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags))
+  readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen))
+  readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags))
+  readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen))
+  CFLAGS += $(readline_cflags)
+endif
+
+LDFLAGS += $(bup_readline_ldflags)
+
+ifeq ($(bup_have_libacl),1)
+  CFLAGS += $(bup_libacl_cflags)
+  LDFLAGS += $(bup_libacl_ldflags)
+endif
+
+config/bin/python: config/config.vars
+
+bup_cmds := \
   $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
   $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
 
-bup_deps := lib/bup/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
+bup_deps := lib/bup/_helpers$(SOEXT) $(bup_cmds)
 
 all: $(bup_deps) Documentation/all $(current_sampledata)
 
 $(current_sampledata):
-	t/configure-sampledata --setup
-
-
-bup_libdir="$script_home/../lib"  # bup_libdir will be adjusted during install
-
-define install-bup-python
-  set -e; \
-  sed -e 's|.*# bup_libdir will be adjusted during install|bup_libdir="$$script_home/.."|' $1 > $2; \
-  chmod 0755 $2;
-endef
+	dev/configure-sampledata --setup
 
 PANDOC ?= $(shell type -p pandoc)
 
@@ -98,9 +116,11 @@ install: all
 	test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(dest_mandir)/man1
 	test -z "$(man_html)" || install -d $(dest_docdir)
 	test -z "$(man_html)" || $(INSTALL) -m 0644 $(man_html) $(dest_docdir)
-	$(INSTALL) -pm 0755 cmd/bup $(dest_libdir)/cmd/
-	$(INSTALL) -pm 0755 cmd/bup-* $(dest_libdir)/cmd/
-	$(call install-bup-python,cmd/bup-python,"$(dest_libdir)/cmd/bup-python")
+	dev/install-python-script lib/cmd/bup "$(dest_libdir)/cmd/bup"
+	set -e; \
+	for cmd in $$(ls cmd/bup-*); do \
+	  dev/install-python-script "$$cmd" "$(dest_libdir)/$$cmd"; \
+	done
 	cd "$(dest_bindir)" && \
 	  ln -sf "$$($(bup_python) -c 'import os; print(os.path.relpath("$(abspath $(dest_libdir))/cmd/bup"))')"
 	set -e; \
@@ -116,149 +136,49 @@ install: all
 	$(INSTALL) -pm 0644 \
 		lib/web/*.html \
 		$(dest_libdir)/web/
+	if test -e lib/bup/checkout_info.py; then \
+	    $(INSTALL) -pm 0644 lib/bup/checkout_info.py \
+	        $(dest_libdir)/bup/source_info.py; \
+	else \
+	    ! grep -qF '$$Format' lib/bup/source_info.py; \
+	    $(INSTALL) -pm 0644 lib/bup/source_info.py $(dest_libdir)/bup/; \
+	fi
 
 config/config.h: config/config.vars
 
 lib/bup/_helpers$(SOEXT): \
-		config/config.h \
+		config/config.h lib/bup/bupsplit.h \
 		lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
 	@rm -f $@
-	cd lib/bup && \
-	LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" "$(bup_python)" csetup.py build
+	cd lib/bup && $(cfg_py) csetup.py build "$(CFLAGS)" "$(LDFLAGS)"
         # Make sure there's just the one file we expect before we copy it.
-	"$(bup_python)" -c \
+	$(cfg_py) -c \
 	  "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
 	cp lib/bup/build/*/_helpers*$(SOEXT) "$@"
 
-lib/bup/_checkout.py:
-	@if grep -F '$Format' lib/bup/_release.py \
-	    && ! test -e lib/bup/_checkout.py; then \
-	  echo "Something has gone wrong; $@ should already exist."; \
-	  echo 'Check "./configure-version --update"'; \
-	  false; \
-	fi
-
-t/tmp:
-	mkdir t/tmp
-
-runtests: runtests-python runtests-cmdline
-
-python_tests := \
-  lib/bup/t/tbloom.py \
-  lib/bup/t/tclient.py \
-  lib/bup/t/tgit.py \
-  lib/bup/t/thashsplit.py \
-  lib/bup/t/thelpers.py \
-  lib/bup/t/tindex.py \
-  lib/bup/t/tmetadata.py \
-  lib/bup/t/toptions.py \
-  lib/bup/t/tresolve.py \
-  lib/bup/t/tshquote.py \
-  lib/bup/t/tvfs.py \
-  lib/bup/t/tvint.py \
-  lib/bup/t/txstat.py
-
-# The "pwd -P" here may not be appropriate in the long run, but we
-# need it until we settle the relevant drecurse/exclusion questions:
-# https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
-runtests-python: all t/tmp
-	mkdir -p t/tmp/test-log
-	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
-	  ./wvtest.py  $(python_tests) 2>&1 \
-	    | tee -a t/tmp/test-log/$$$$.log
-
-cmdline_tests := \
-  t/test-argv \
-  t/test-cat-file.sh \
-  t/test-command-without-init-fails.sh \
-  t/test-compression.sh \
-  t/test-drecurse.sh \
-  t/test-fsck.sh \
-  t/test-gc.sh \
-  t/test-import-duplicity.sh \
-  t/test-index.sh \
-  t/test-index-clear.sh \
-  t/test-list-idx.sh \
-  t/test-ls \
-  t/test-ls-remote \
-  t/test-meta.sh \
-  t/test-packsizelimit \
-  t/test-redundant-saves.sh \
-  t/test-restore-single-file.sh \
-  t/test-rm.sh \
-  t/test-rm-between-index-and-save.sh \
-  t/test-save-creates-no-unrefs.sh \
-  t/test-save-restore \
-  t/test-save-restore-excludes.sh \
-  t/test-save-strip-graft.sh \
-  t/test-save-with-valid-parent.sh \
-  t/test-sparse-files.sh \
-  t/test-split-join.sh \
-  t/test-tz.sh
-
-ifeq "2" "$(bup_python_majver)"
-  cmdline_tests += \
-    t/test-ftp \
-    t/test-prune-older \
-    t/test-web.sh \
-    t/test-main.sh \
-    t/test-fuse.sh \
-    t/test-index-check-device.sh \
-    t/test-on.sh \
-    t/test-restore-map-owner.sh \
-    t/test-import-rdiff-backup.sh \
-    t/test-xdev.sh \
-    t/test.sh
-endif
+test/tmp:
+	mkdir test/tmp
 
-tmp-target-run-test-get-%: all t/tmp
-	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
-	  t/test-get $* 2>&1 | tee -a t/tmp/test-log/$$$$.log
-
-test_get_targets :=
-
-ifeq "2" "$(bup_python_majver)"
-  test_get_targets += \
-    tmp-target-run-test-get-replace \
-    tmp-target-run-test-get-universal \
-    tmp-target-run-test-get-ff \
-    tmp-target-run-test-get-append \
-    tmp-target-run-test-get-pick \
-    tmp-target-run-test-get-new-tag \
-    tmp-target-run-test-get-unnamed
+ifeq (yes,$(shell config/bin/python -c "import xdist; print('yes')" 2>/dev/null))
+  # MAKEFLAGS must not be in an immediate := assignment
+  parallel_opt = $(lastword $(filter -j%,$(MAKEFLAGS)))
+  get_parallel_n = $(patsubst -j%,%,$(parallel_opt))
+  maybe_specific_n = $(if $(filter -j%,$(parallel_opt)),-n$(get_parallel_n))
+  xdist_opt = $(if $(filter -j,$(parallel_opt)),-nauto,$(maybe_specific_n))
+else
+  xdist_opt =
 endif
 
-# For parallel runs.
-# The "pwd -P" here may not be appropriate in the long run, but we
-# need it until we settle the relevant drecurse/exclusion questions:
-# https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
-tmp-target-run-test%: all t/tmp
-	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
-	  t/test$* 2>&1 | tee -a t/tmp/test-log/$$$$.log
-
-runtests-cmdline: $(test_get_targets) $(subst t/test,tmp-target-run-test,$(cmdline_tests))
+test: all test/tmp
+	./pytest $(xdist_opt)
 
 stupid:
 	PATH=/bin:/usr/bin $(MAKE) test
 
-test: all
-	if test -e t/tmp/test-log; then rm -r t/tmp/test-log; fi
-	mkdir -p t/tmp/test-log
-	./wvtest watch --no-counts \
-	  $(MAKE) runtests 2>t/tmp/test-log/$$$$.log
-	./wvtest report t/tmp/test-log/*.log
-
 check: test
 
 distcheck: all
-	./wvtest run t/test-release-archive.sh
-
-cmd/bup-python: cmd/python-cmd.sh config/config.var/bup-python
-	"$$(cat config/config.var/bup-python)" dev/replace -l '@bup_python@' \
-	  "$$(dev/shquote < config/config.var/bup-python)" \
-	  < "$<" > "$@".$$PPID.tmp
-	chmod +x "$@".$$PPID.tmp
-	mv "$@".$$PPID.tmp "$@"
+	./pytest $(xdist_opt) -m release
 
 long-test: export BUP_TEST_LEVEL=11
 long-test: test
@@ -268,10 +188,8 @@ long-check: check
 
 .PHONY: check-both
 check-both:
-	$(MAKE) clean \
-	  && PYTHON=python3 BUP_ALLOW_UNEXPECTED_PYTHON_VERSION=true $(MAKE) check
-	$(MAKE) clean \
-	  && PYTHON=python2 $(MAKE) check
+	$(MAKE) clean && PYTHON=python3 $(MAKE) check
+	$(MAKE) clean && PYTHON=python2 $(MAKE) check
 
 cmd/bup-%: cmd/%-cmd.py
 	rm -f $@
@@ -285,7 +203,7 @@ cmd/bup-%: cmd/%-cmd.sh
 Documentation/all: $(man_roff) $(man_html)
 
 Documentation/substvars: $(bup_deps)
-	echo "s,%BUP_VERSION%,$$(./bup version --tag),g" > $@
+	echo "s,%BUP_VERSION%,$$(./bup version),g" > $@
 	echo "s,%BUP_DATE%,$$(./bup version --date),g" >> $@
 
 Documentation/%.1: Documentation/%.md Documentation/substvars
@@ -317,27 +235,27 @@ import-docs: Documentation/clean
 	$(pf); git archive origin/html | (cd Documentation && tar -xvf -)
 	$(pf); git archive origin/man | (cd Documentation && tar -xvf -)
 
-clean: Documentation/clean cmd/bup-python
+clean: Documentation/clean config/bin/python
+	cd config && rm -rf config.var
 	cd config && rm -f *~ .*~ \
 	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
-	cd config && rm -rf config.var
 	rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
 		.*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
 		*.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
+		lib/bup/checkout_info.py \
 		randomgen memtest \
-		testfs.img lib/bup/t/testfs.img
+		testfs.img test/int/testfs.img
 	for x in $$(ls cmd/*-cmd.py cmd/*-cmd.sh | grep -vF python-cmd.sh | cut -b 5-); do \
 	    echo "cmd/bup-$${x%-cmd.*}"; \
 	done | xargs -t rm -f
-	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 lib/bup/t/testfs; \
-	  then umount lib/bup/t/testfs || 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
-	./configure-version --clean
-	t/configure-sampledata --clean
+	if test -e test/mnt; then dev/cleanup-mounts-under test/mnt; fi
+	if test -e test/mnt; then rm -r test/mnt; fi
+	if test -e test/tmp; then dev/cleanup-mounts-under test/tmp; fi
+        # FIXME: migrate these to test/mnt/
+	if test -e test/int/testfs; \
+	  then umount test/int/testfs || true; fi
+	rm -rf *.tmp *.tmp.meta test/*.tmp lib/*/*/*.tmp build lib/bup/build test/int/testfs
+	if test -e test/tmp; then dev/force-delete test/tmp; fi
+	dev/configure-sampledata --clean
         # Remove last so that cleanup tools can depend on it
-	rm -f cmd/bup-python
+	rm -rf config/bin