@rm -f $@
cd lib/bup && \
LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" "$(bup_python)" csetup.py build
- cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
+ # Make sure there's just the one file we expect before we copy it.
+ "$(bup_python)" -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 \
t/tmp:
mkdir t/tmp
-runtests: runtests-python runtests-cmdline
+ifeq "2" "$(bup_python_majver)"
+ runtests: runtests-python runtests-cmdline
+else
+ runtests: runtests-cmdline
+endif
# The "pwd -P" here may not be appropriate in the long run, but we
# need it until we settle the relevant drecurse/exclusion questions:
"$(bup_python)" wvtest.py t/t*.py lib/*/t/t*.py 2>&1 \
| tee -a t/tmp/test-log/$$$$.log
-cmdline_tests := \
- t/test-save-restore \
- t/test-packsizelimit \
- t/test-prune-older \
- t/test-web.sh \
- t/test-rm.sh \
- t/test-gc.sh \
- t/test-main.sh \
- t/test-list-idx.sh \
- t/test-index.sh \
- t/test-split-join.sh \
- 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-tz.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-save-with-valid-parent.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
+ifeq "2" "$(bup_python_majver)"
+ cmdline_tests := \
+ t/test-ftp \
+ t/test-save-restore \
+ t/test-packsizelimit \
+ t/test-prune-older \
+ t/test-web.sh \
+ t/test-rm.sh \
+ t/test-gc.sh \
+ t/test-main.sh \
+ t/test-list-idx.sh \
+ t/test-index.sh \
+ t/test-split-join.sh \
+ 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 \
+ t/test-ls-remote \
+ t/test-tz.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-save-with-valid-parent.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
+else
+ cmdline_tests :=
+endif
+
+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
+
+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
+else
+ test_get_targets :=
+endif
# For parallel runs.
# The "pwd -P" here may not be appropriate in the long run, but we
$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
t/test$* 2>&1 | tee -a t/tmp/test-log/$$$$.log
-runtests-cmdline: $(subst t/test,tmp-target-run-test,$(cmdline_tests))
+runtests-cmdline: $(test_get_targets) $(subst t/test,tmp-target-run-test,$(cmdline_tests))
stupid:
PATH=/bin:/usr/bin $(MAKE) test
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-python runtests-cmdline 2>t/tmp/test-log/$$$$.log
+ $(MAKE) runtests 2>t/tmp/test-log/$$$$.log
./wvtest report t/tmp/test-log/*.log
check: test
chmod +x cmd/python-cmd.sh.$$PPID.tmp
mv cmd/python-cmd.sh.$$PPID.tmp cmd/python-cmd.sh
+long-test: export BUP_TEST_LEVEL=11
+long-test: test
+
+long-check: export BUP_TEST_LEVEL=11
+long-check: check
+
cmd/bup-%: cmd/%-cmd.py
rm -f $@
ln -s $*-cmd.py $@
Documentation/clean:
cd Documentation && rm -f *~ .*~ *.[0-9] *.html substvars
-# update the local 'man' and 'html' branches with pregenerated output files, for
-# people who don't have pandoc (and maybe to aid in google searches or something)
-export-docs: Documentation/all
- git update-ref refs/heads/man origin/man '' 2>/dev/null || true
- git update-ref refs/heads/html origin/html '' 2>/dev/null || true
- set -eo pipefail; \
- GIT_INDEX_FILE=gitindex.tmp; export GIT_INDEX_FILE; \
- rm -f $${GIT_INDEX_FILE} && \
- git add -f Documentation/*.1 && \
- git update-ref refs/heads/man \
- $$(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 --always)" \
- | git commit-tree $$(git write-tree --prefix=Documentation) \
- -p refs/heads/html)
+# Note: this adds commits containing the current manpages in roff and
+# html format to the man and html branches respectively. The version
+# is determined by "git describe --always".
+.PHONY: update-doc-branches
+update-doc-branches: Documentation/all
+ dev/update-doc-branches refs/heads/man refs/heads/html
# push the pregenerated doc files to origin/man and origin/html
push-docs: export-docs
projects / bup.git / blobdiff