mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
test: Install test journals
Let's package these just like we package other test data.
This commit is contained in:
@@ -11,9 +11,6 @@ test_append_files() {
|
||||
local workspace="${1:?}"
|
||||
local dropin_dir
|
||||
|
||||
mkdir -p "$workspace/test-journals/"
|
||||
cp -av "${TEST_BASE_DIR:?}/test-journals/"* "$workspace/test-journals/"
|
||||
|
||||
image_install curl setterm unzstd
|
||||
image_install -o openssl
|
||||
# Necessary for RH-based systems, otherwise MHD fails with:
|
||||
|
||||
@@ -4,6 +4,7 @@ if install_tests
|
||||
foreach subdir : [
|
||||
'auxv',
|
||||
'journal-data',
|
||||
'test-journals',
|
||||
'units',
|
||||
'test-execute',
|
||||
'test-fstab-generator',
|
||||
|
||||
@@ -6,11 +6,11 @@ set -o pipefail
|
||||
JOURNAL_DIR="$(mktemp -d)"
|
||||
REMOTE_OUT="$(mktemp -d)"
|
||||
# tar on C8S doesn't support the --zstd option
|
||||
unzstd --stdout "/test-journals/afl-corrupted-journals.tar.zst" | tar -xC "$JOURNAL_DIR/"
|
||||
unzstd --stdout "/usr/lib/systemd/tests/testdata/test-journals/afl-corrupted-journals.tar.zst" | tar -xC "$JOURNAL_DIR/"
|
||||
while read -r file; do
|
||||
filename="${file##*/}"
|
||||
unzstd "$file" -o "$JOURNAL_DIR/${filename%*.zst}"
|
||||
done < <(find /test-journals/corrupted/ -name "*.zst")
|
||||
done < <(find /usr/lib/systemd/tests/testdata/test-journals/corrupted/ -name "*.zst")
|
||||
# First, try each of them sequentially. Skip this part when running with plain
|
||||
# QEMU, as it is excruciatingly slow
|
||||
# Note: we care only about exit code 124 (timeout) and special bash exit codes
|
||||
|
||||
@@ -244,7 +244,7 @@ JOURNAL_DIR="$(mktemp -d)"
|
||||
while read -r file; do
|
||||
filename="${file##*/}"
|
||||
unzstd "$file" -o "$JOURNAL_DIR/${filename%*.zst}"
|
||||
done < <(find /test-journals/no-rtc -name "*.zst")
|
||||
done < <(find /usr/lib/systemd/tests/testdata/test-journals/no-rtc -name "*.zst")
|
||||
|
||||
journalctl --directory="$JOURNAL_DIR" --list-boots --output=json >/tmp/lb1
|
||||
diff -u /tmp/lb1 - <<'EOF'
|
||||
|
||||
Reference in New Issue
Block a user