From 51d56d3be07953d0cf090f3311a81f1d3ada1dcf Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 26 Dec 2020 20:11:55 +0000 Subject: [PATCH] tests: add TEST_QEMU_ONLY variable to run only tests where qemu is mandatory Allows to split the test run in two parts. Most tests can run under nspawn which is much faster, and they can be ran in one chunk with TEST_NO_QEMU=1. The qemu-only tests, which are just a handful, can be ran in another chunk with TEST_QEMU_ONLY=1. Allows autopkgtest to be split in two parts. --- test/README.testsuite | 3 +++ test/test-functions | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/test/README.testsuite b/test/README.testsuite index 5d9e498c51..45bd239f34 100644 --- a/test/README.testsuite +++ b/test/README.testsuite @@ -47,6 +47,9 @@ Configuration variables TEST_NO_QEMU=1 Don't run tests under QEMU +TEST_QEMU_ONLY=1 + Run only tests that require QEMU + TEST_NO_NSPAWN=1 Don't run tests under systemd-nspawn diff --git a/test/test-functions b/test/test-functions index 52331d7845..a88a8d2c04 100644 --- a/test/test-functions +++ b/test/test-functions @@ -2112,6 +2112,11 @@ do_test() { exit 0 fi + if [ -n "$TEST_QEMU_ONLY" ] && [ -z "$TEST_NO_NSPAWN" ]; then + echo "TEST: $TEST_DESCRIPTION [SKIPPED]: QEMU-only tests requested" >&2 + exit 0 + fi + # Detect lib paths [[ $libdir ]] || for libdir in /lib64 /lib; do [[ -d $libdir ]] && libdirs+=" $libdir" && break