diff --git a/test/TEST-02-UNITTESTS/test.sh b/test/TEST-02-UNITTESTS/test.sh index 80cb82a50d1..3d766db3e74 100755 --- a/test/TEST-02-UNITTESTS/test.sh +++ b/test/TEST-02-UNITTESTS/test.sh @@ -20,6 +20,13 @@ $KERNEL_APPEND # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" +test_append_files() { + if get_bool "$LOOKS_LIKE_SUSE"; then + dinfo "Install the unit test binaries needed by the TEST-02-UNITTESTS at runtime" + inst_recursive "${SOURCE_DIR}/unit-tests" + fi +} + check_result_nspawn() { check_result_nspawn_unittests "${1}" } diff --git a/test/test-functions b/test/test-functions index 472ede1ba0a..fbb35a84ad3 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1179,17 +1179,8 @@ install_suse_systemd() { done < <(rpm -ql "$p") done - # Embed the files needed by the extended testsuite at runtime. Also include - # the unit tests needed by TEST-02-UNITTESTS. This is mostly equivalent to - # what `ninja install` does for the tests when '-Dinstall-tests=true'. - # - # Why? openSUSE ships a package named 'systemd-testsuite' which contains - # the minimal set of files that allows to run the testsuite on the host (as - # long as it runs an equivalent version of systemd) getting rid of the - # hassles of fetching, configuring, building the source code. - dinfo "Install the files needed by the tests at runtime" + dinfo "Install the data needed by the tests at runtime" inst_recursive "${SOURCE_DIR}/testdata" - inst_recursive "${SOURCE_DIR}/unit-tests" # On openSUSE, this directory is not created at package install, at least # for now.