test_index: don't create an extra writer

[bup.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 0ba62119a7bf34af85bd76a7f37d2094b7b21e5e..5c0f72501f0c5f25acaa1b8dce1ee9ac4f020bb1 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -40,9 +40,9 @@ LDFLAGS ?=
 TARGET_ARCH ?=
 
 bup_shared_cflags := -O2 -Wall -Werror -Wformat=2
-bup_shared_cflags := -Wno-unused-command-line-argument $(bup_shared_cflags)
 bup_shared_cflags := -Wno-unknown-pragmas -Wsign-compare $(bup_shared_cflags)
 bup_shared_cflags := -D_FILE_OFFSET_BITS=64 $(bup_shared_cflags)
+bup_shared_cflags := $(bup_config_cflags) $(bup_shared_cflags)
 
 bup_shared_ldflags :=
 
@@ -235,10 +235,14 @@ long-test: test
 long-check: export BUP_TEST_LEVEL=11
 long-check: check
 
-.PHONY: check-both
-check-both:
+.PHONY: check-py2 check-py3 check-both
+check-py3:
        $(MAKE) clean && BUP_PYTHON_CONFIG=python3-config $(MAKE) check
+check-py2:
        $(MAKE) clean && BUP_PYTHON_CONFIG=python2.7-config $(MAKE) check
+check-both:
+       $(MAKE) check-py3
+       $(MAKE) check-py2
 
 .PHONY: Documentation/all
 Documentation/all: $(man_roff) $(man_html)
@@ -281,11 +285,8 @@ import-docs: Documentation/clean
 
 clean: Documentation/clean
        cd config && rm -rf finished bin config.var
-       cd config && rm -f \
-         ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
-       rm -rf $(clean_paths) .pytest_cache
-       rm -f $(generated_dependencies)
-       find . -name __pycache__ -exec rm -rf {} +
+
+        # Clean up the mounts first, so that find, etc. won't crash later
        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
@@ -293,5 +294,13 @@ clean: Documentation/clean
        if test -e test/int/testfs; \
          then umount test/int/testfs || true; fi
        rm -rf test/int/testfs test/int/testfs.img testfs.img
+
+       cd config && rm -f \
+         ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
+       rm -rf $(clean_paths) .pytest_cache
+       rm -f $(generated_dependencies)
+       find . -name __pycache__ -exec rm -rf {} +
+        # Remove this *.pyc cleanup once we drop py2
+       rm -f lib/bup/*.pyc lib/bup/cmd/*.pyc test/__init__.pyc
        if test -e test/tmp; then dev/force-delete test/tmp; fi
        dev/configure-sampledata --clean