diff --git a/Vagrantfile b/Vagrantfile index e74796288..d0e5fea79 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -34,7 +34,7 @@ def packages_arch locale-gen localectl set-locale LANG=en_US.UTF-8 chown vagrant.vagrant /vagrant - pacman --sync --noconfirm --refresh python-virtualenv python-pip + pacman -Syu --noconfirm python-virtualenv python-pip EOF end @@ -258,7 +258,7 @@ Vagrant.configure(2) do |config| b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("focal64") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("focal64", "^$") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("focal64", ".*none.*") end config.vm.define "bionic64" do |b| @@ -286,7 +286,7 @@ Vagrant.configure(2) do |config| b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("buster64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster64", "^$") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster64", ".*none.*") end config.vm.define "stretch64" do |b| @@ -314,7 +314,7 @@ Vagrant.configure(2) do |config| b.vm.provision "packages arch", :type => :shell, :privileged => true, :inline => packages_arch b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("arch64") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("arch64", "^$") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("arch64", ".*none.*") end config.vm.define "freebsd64" do |b| diff --git a/tox.ini b/tox.ini index 0b4508363..7b29f8a1b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ # fakeroot -u tox --recreate [tox] -envlist = py{36,37,38,39}-fuse{2,3} +envlist = py{36,37,38,39}-{none,fuse2,fuse3} [testenv] deps =