Adding upstream version 060+5.upstream/060+5

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 81 insertions, 0 deletions

diff --git a/test/TEST-62-SKIPCPIO/Makefile b/test/TEST-62-SKIPCPIO/Makefile
new file mode 100644
index 0000000..2dcab81
--- /dev/null
+++ b/test/TEST-62-SKIPCPIO/Makefile
@@ -0,0 +1 @@
+-include ../Makefile.testdir
diff --git a/test/TEST-62-SKIPCPIO/test.sh b/test/TEST-62-SKIPCPIO/test.sh
new file mode 100755
index 0000000..2311da3
--- /dev/null
+++ b/test/TEST-62-SKIPCPIO/test.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+# This file is part of dracut.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# shellcheck disable=SC2034
+TEST_DESCRIPTION="test skipcpio"
+
+test_check() {
+    cpio dd truncate find sort diff &> /dev/null
+}
+
+skipcpio_simple() {
+    mkdir -p "$CPIO_TESTDIR/skipcpio_simple/first_archive"
+    pushd "$CPIO_TESTDIR/skipcpio_simple/first_archive"
+
+    for ((i = 0; i < 3; i++)); do
+        echo "first archive file $i" >> ./"$i"
+    done
+    find . -print0 | sort -z \
+        | cpio -o --null -H newc --file "$CPIO_TESTDIR/skipcpio_simple.cpio"
+    popd
+
+    mkdir -p "$CPIO_TESTDIR/skipcpio_simple/second_archive"
+    pushd "$CPIO_TESTDIR/skipcpio_simple/second_archive"
+
+    for ((i = 10; i < 13; i++)); do
+        echo "second archive file $i" >> ./"$i"
+    done
+
+    find . -print0 | sort -z \
+        | cpio -o --null -H newc >> "$CPIO_TESTDIR/skipcpio_simple.cpio"
+    popd
+
+    cpio -i --list < "$CPIO_TESTDIR/skipcpio_simple.cpio" \
+        > "$CPIO_TESTDIR/skipcpio_simple.list"
+    cat << EOF | diff - "$CPIO_TESTDIR/skipcpio_simple.list"
+.
+0
+1
+2
+EOF
+
+    if [ "$PKGLIBDIR" = "$basedir" ]; then
+        skipcpio_path="${PKGLIBDIR}/src/skipcpio"
+    else
+        skipcpio_path="${PKGLIBDIR}"
+    fi
+    "$skipcpio_path"/skipcpio "$CPIO_TESTDIR/skipcpio_simple.cpio" \
+        | cpio -i --list > "$CPIO_TESTDIR/skipcpio_simple.list"
+    cat << EOF | diff - "$CPIO_TESTDIR/skipcpio_simple.list"
+.
+10
+11
+12
+EOF
+}
+
+test_run() {
+    set -x
+    set -e
+
+    skipcpio_simple
+
+    return 0
+}
+
+test_setup() {
+    CPIO_TESTDIR=$(mktemp --directory -p "$TESTDIR" cpio-test.XXXXXXXXXX) \
+        || return 1
+    export CPIO_TESTDIR
+    return 0
+}
+
+test_cleanup() {
+    [ -d "$CPIO_TESTDIR" ] && rm -rf "$CPIO_TESTDIR"
+    return 0
+}
+
+# shellcheck disable=SC1090
+. "$testdir"/test-functions