diff options
Diffstat (limited to 'test/test-functions')
| -rw-r--r-- | test/test-functions | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/test/test-functions b/test/test-functions index eb1d99e0d1..3b225cd677 100644 --- a/test/test-functions +++ b/test/test-functions @@ -864,6 +864,7 @@ install_modules() { instmods loop instmods vfat + instmods nls_ascii =nls instmods dummy if [[ "$LOOKS_LIKE_SUSE" ]]; then @@ -1228,6 +1229,66 @@ check_result_qemu() { return $ret } +check_result_nspawn_unittests() { + local workspace="${1:?}" + local ret=1 + + [[ -e "$workspace/testok" ]] && ret=0 + + if [[ -s "$workspace/failed" ]]; then + ret=$((ret + 1)) + echo "=== Failed test log ===" + cat "$workspace/failed" + else + if [[ -s "$workspace/skipped" ]]; then + echo "=== Skipped test log ==" + cat "$workspace/skipped" + # We might have only skipped tests - that should not fail the job + ret=0 + fi + if [[ -s "$workspace/testok" ]]; then + echo "=== Passed tests ===" + cat "$workspace/testok" + fi + fi + + save_journal "$workspace/var/log/journal" + _umount_dir "${initdir:?}" + + [[ -n "${TIMED_OUT:=}" ]] && ret=1 + return $ret +} + +check_result_qemu_unittests() { + local ret=1 + + mount_initdir + [[ -e "${initdir:?}/testok" ]] && ret=0 + + if [[ -s "$initdir/failed" ]]; then + ret=$((ret + 1)) + echo "=== Failed test log ===" + cat "$initdir/failed" + else + if [[ -s "$initdir/skipped" ]]; then + echo "=== Skipped test log ==" + cat "$initdir/skipped" + # We might have only skipped tests - that should not fail the job + ret=0 + fi + if [[ -s "$initdir/testok" ]]; then + echo "=== Passed tests ===" + cat "$initdir/testok" + fi + fi + + save_journal "$initdir/var/log/journal" + _umount_dir "$initdir" + + [[ -n "${TIMED_OUT:=}" ]] && ret=1 + return $ret +} + strip_binaries() { dinfo "Strip binaries" if [[ "$STRIP_BINARIES" = "no" ]]; then |