Update base_version to 0.34~ for 0.34 development

[bup.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 48725d2f5413659dad5d374f1ac6d0f558697d41..767b0ee0f66a7e1ed714e33af1200686b51b3d42 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,6 +4,12 @@ MAKEFLAGS += --warn-undefined-variables
 SHELL := bash
 .DEFAULT_GOAL := all
 
+# So where possible we can make tests more reproducible
+export BUP_TEST_RANDOM_SEED ?= $(shell echo "$$RANDOM")
+
+# Guard against accidentally using/testing a local bup
+export PATH := $(CURDIR)/dev/shadow-bin:$(PATH)
+
 clean_paths :=
 generated_dependencies :=
 
@@ -170,7 +176,7 @@ dev/python-proposed: dev/python.c src/bup/compat.c src/bup/io.c
 clean_paths += dev/python
 dev/python: dev/python-proposed
        dev/validate-python $@-proposed
-       cp -a $@-proposed $@
+       cp -R -p $@-proposed $@
 
 clean_paths += dev/bup-exec
 generated_dependencies += dev/bup-exec.d
@@ -208,6 +214,7 @@ lint: dev/bup-exec dev/bup-python
        ./pylint
 
 test: all test/tmp dev/python lint
+       ! bup version  # Ensure we can't test the local bup (cf. dev/shadow-bin)
        ./bup features
        if test yes = "$$(dev/python -c 'import xdist; print("yes")' 2>/dev/null)"; then \
           (set -x; ./pytest $(xdist_opt);) \