X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=4bfd833e15691955d3b53d6a7cf3a1b4553c03bd;hb=d1291f927f680ba0a146ba3bb1fd23dec6c61066;hp=24d75faae9b04c801b7291fd67603aca57ae2beb;hpb=65a99a77cc9be42f394198abb07f40b6de48b3d5;p=bup.git diff --git a/Makefile b/Makefile index 24d75fa..4bfd833 100644 --- a/Makefile +++ b/Makefile @@ -145,23 +145,19 @@ 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 -ifeq "2" "$(bup_python_majver)" - python_tests += \ - lib/bup/t/tclient.py \ - lib/bup/t/tresolve.py -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: # https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0 @@ -171,11 +167,14 @@ runtests-python: all t/tmp ./wvtest.py $(python_tests) 2>&1 \ | tee -a t/tmp/test-log/$$$$.log -cmdline_tests := +cmdline_tests := \ + t/test-argv \ + t/test-compression.sh \ + t/test-index-clear.sh \ + t/test-tz.sh ifeq "2" "$(bup_python_majver)" cmdline_tests += \ - t/test-argv \ t/test-ftp \ t/test-save-restore \ t/test-packsizelimit \ @@ -190,13 +189,10 @@ ifeq "2" "$(bup_python_majver)" 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 \