$(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)
ifdef TMPDIR
test_tmp := $(TMPDIR)
else
- test_tmp := $(CURDIR)/t/tmp
+ test_tmp := $(CURDIR)/test/tmp
endif
initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
LDFLAGS += $(bup_libacl_ldflags)
endif
-config/bin/python: config/config.vars
+bup_ext_cmds := lib/cmd/bup-import-rdiff-backup lib/cmd/bup-import-rsnapshot
-bup_cmds := \
- $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
- $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
+config/bin/python: config/config.vars
-bup_deps := lib/bup/_helpers$(SOEXT) $(bup_cmds)
+bup_deps := lib/bup/_helpers$(SOEXT)
all: $(bup_deps) Documentation/all $(current_sampledata)
$(current_sampledata):
- t/configure-sampledata --setup
+ dev/configure-sampledata --setup
PANDOC ?= $(shell type -p pandoc)
dest_libdir := $(DESTDIR)$(LIBDIR)
install: all
- $(INSTALL) -d $(dest_bindir) \
- $(dest_libdir)/bup $(dest_libdir)/cmd \
- $(dest_libdir)/web $(dest_libdir)/web/static
+ $(INSTALL) -d $(dest_bindir) $(dest_libdir)/bup/cmd $(dest_libdir)/cmd \
+ $(dest_libdir)/web/static
test -z "$(man_roff)" || install -d $(dest_mandir)/man1
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)
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
+ $(INSTALL) -pm 0755 $(bup_ext_cmds) "$(dest_libdir)/cmd/"
cd "$(dest_bindir)" && \
ln -sf "$$($(bup_python) -c 'import os; print(os.path.relpath("$(abspath $(dest_libdir))/cmd/bup"))')"
set -e; \
- $(INSTALL) -pm 0644 \
- lib/bup/*.py \
- $(dest_libdir)/bup
+ $(INSTALL) -pm 0644 lib/bup/*.py $(dest_libdir)/bup/
+ $(INSTALL) -pm 0644 lib/bup/cmd/*.py $(dest_libdir)/bup/cmd/
$(INSTALL) -pm 0755 \
lib/bup/*$(SOEXT) \
$(dest_libdir)/bup
$(INSTALL) -pm 0644 lib/bup/source_info.py $(dest_libdir)/bup/; \
fi
-
- $(INSTALL) -pm 0644 lib/bup/checkout_info.py $(dest_libdir)/bup/; \
-
config/config.h: config/config.vars
lib/bup/_helpers$(SOEXT): \
"import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
cp lib/bup/build/*/_helpers*$(SOEXT) "$@"
-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.sh \
- 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-fuse.sh \
- t/test-ftp \
- t/test-web.sh \
- t/test-gc.sh \
- t/test-import-duplicity.sh \
- t/test-import-rdiff-backup.sh \
- t/test-index.sh \
- t/test-index-check-device.sh \
- t/test-index-clear.sh \
- t/test-list-idx.sh \
- t/test-ls \
- t/test-ls-remote \
- t/test-main.sh \
- t/test-meta.sh \
- t/test-on.sh \
- t/test-packsizelimit \
- t/test-prune-older \
- t/test-redundant-saves.sh \
- t/test-restore-map-owner.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-errors \
- 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 \
- t/test-xdev.sh
-
-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 += \
- 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
-
-# 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/tmp:
+ mkdir test/tmp
+
+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
+
+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
+ ./pytest $(xdist_opt) -m release
long-test: export BUP_TEST_LEVEL=11
long-test: test
$(MAKE) clean && PYTHON=python3 $(MAKE) check
$(MAKE) clean && PYTHON=python2 $(MAKE) check
-cmd/bup-%: cmd/%-cmd.py
- rm -f $@
- ln -s $*-cmd.py $@
-
-cmd/bup-%: cmd/%-cmd.sh
- rm -f $@
- ln -s $*-cmd.sh $@
-
.PHONY: Documentation/all
Documentation/all: $(man_roff) $(man_html)
Documentation/substvars: $(bup_deps)
- echo "s,%BUP_VERSION%,$$(./bup version),g" > $@
- echo "s,%BUP_DATE%,$$(./bup version --date),g" >> $@
+ # FIXME: real temp file
+ set -e; bup_ver=$$(./bup version); \
+ echo "s,%BUP_VERSION%,$$bup_ver,g" > $@.tmp; \
+ echo "s,%BUP_DATE%,$$bup_ver,g" >> $@.tmp
+ mv $@.tmp $@
Documentation/%.1: Documentation/%.md Documentation/substvars
$(pf); sed -f Documentation/substvars $< \
*.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
lib/bup/checkout_info.py \
randomgen memtest \
- testfs.img lib/bup/t/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
- t/configure-sampledata --clean
+ testfs.img test/int/testfs.img
+ 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 -rf config/bin
projects / bup.git / blobdiff