run tests with lxc-usernsexec; build-depend on lxc or lxc-pve

diff --git a/debian/control b/debian/control
index d195fcabd96c28480ad43900a3bcaad1554a7f96..e9c7364520092ca9e24cc7e57a897219b5c25c7b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pve-container
 Section: perl
 Priority: extra
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 7.0.50~), libpve-common-perl, libpve-guest-common-perl | libpve-common-perl (<= 4.0-89), libpve-storage-perl, pve-cluster (>= 4.0-8), libtest-mockmodule-perl, pve-doc-generator
+Build-Depends: debhelper (>= 7.0.50~), libpve-common-perl, libpve-guest-common-perl | libpve-common-perl (<= 4.0-89), libpve-storage-perl, pve-cluster (>= 4.0-8), libtest-mockmodule-perl, pve-doc-generator, lxc | lxc-pve
 Standards-Version: 3.8.4
 
 Package: pve-container

diff --git a/src/test/Makefile b/src/test/Makefile
index 497a179ad56bf0b64bc1b1cbb0b06b9810a968be..491863dd644fd5da8c05ed6b55a7a774a6f350e7 100644 (file)
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,16 +1,18 @@
+RUN_USERNS := lxc-usernsexec -m "b:0:`id -u`:1" --
+
 all:
 
 
 test: test_setup test_snapshot test_bindmount
 
 test_setup: run_setup_tests.pl
-       ./run_setup_tests.pl
+       $(RUN_USERNS) ./run_setup_tests.pl
 
 test_snapshot: run_snapshot_tests.pl
        ./run_snapshot_tests.pl
 
 test_bindmount: bindmount_test.pl
-       ./bindmount_test.pl
+       $(RUN_USERNS) ./bindmount_test.pl
 
 clean:
        rm -rf tmprootfs