Add test for "child named after parent" bug.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index e04235d5f86702511d6a677b4733badcfbf8f408..ce91ff0172451b167f76db86ad13cc8aa207bdf1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,11 +79,15 @@ lib/bup/_version.py:
 runtests: all runtests-python runtests-cmdline
 
 runtests-python:
-       $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
+       $(PYTHON) wvtest.py \
+               $(wildcard t/t*.py) \
+               $(filter-out lib/bup/t/tmetadata.py,$(wildcard lib/*/t/t*.py))
+       [ -z "${TEST_META}" ] || \
+       $(PYTHON) wvtest.py lib/bup/t/tmetadata.py
 
 runtests-cmdline: all
        t/test.sh
-       t/test-meta.sh
+       [ -z "${TEST_META}" ] || t/test-meta.sh
 
 stupid:
        PATH=/bin:/usr/bin $(MAKE) test
@@ -146,10 +150,8 @@ import-docs: Documentation/clean
        git archive origin/html | (cd Documentation; tar -xvf -)
        git archive origin/man | (cd Documentation; tar -xvf -)
 
-# tgit.py plays with permissions on lib/bup/t/pybuptest.tmp, so we should
-# ensure that we can delete the directory before doing it.
 clean: Documentation/clean
-       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll *.exe \
+       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
                bup bup-* cmd/bup-* lib/bup/_version.py randomgen memtest \