File TEST-62-SKIPCPIO-V59-openQA.patch of Package dracut

Overview Repositories Revisions Requests Users Attributes Meta

File TEST-62-SKIPCPIO-V59-openQA.patch of Package dracut (Revision 3e2ad3168ecf719fb97860c15405377b)

Currently displaying revision 3e2ad3168ecf719fb97860c15405377b , Show latest

From 78ba39a6392ec50b5c3888fc0f9ea8b638240e4c Mon Sep 17 00:00:00 2001
From: nkrapp <nico.krapp@suse.com>
Date: Mon, 8 May 2023 14:40:17 +0200
Subject: [PATCH] Patch TEST-62

---
 test/TEST-62-SKIPCPIO/test.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/TEST-62-SKIPCPIO/test.sh b/test/TEST-62-SKIPCPIO/test.sh
index fa6183286b..2fc41b27b0 100755
--- a/test/TEST-62-SKIPCPIO/test.sh
+++ b/test/TEST-62-SKIPCPIO/test.sh
@@ -5,6 +5,8 @@
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="test skipcpio"
 
+export basedir=/usr/lib/dracut
+
 test_check() {
     cpio dd truncate find sort diff &> /dev/null
 }
@@ -40,7 +42,7 @@ skipcpio_simple() {
 2
 EOF
 
-    "$basedir"/src/skipcpio/skipcpio "$CPIO_TESTDIR/skipcpio_simple.cpio" \
+    "$basedir"/skipcpio "$CPIO_TESTDIR/skipcpio_simple.cpio" \
         | cpio -i --list > "$CPIO_TESTDIR/skipcpio_simple.list"
     cat << EOF | diff - "$CPIO_TESTDIR/skipcpio_simple.list"
 .
@@ -54,6 +56,10 @@ test_run() {
     set -x
     set -e
 
+    # bug in setup: export CPIO_TESTDIR cannot work for test.sh --run
+    . test.sh --setup
+    export CPIO_TESTDIR
+
     skipcpio_simple
 
     return 0
@@ -62,7 +68,6 @@ test_run() {
 test_setup() {
     CPIO_TESTDIR=$(mktemp --directory -p "$TESTDIR" cpio-test.XXXXXXXXXX) \
         || return 1
-    export CPIO_TESTDIR
     return 0
 }
 
@@ -72,4 +77,4 @@ test_cleanup() {
 }
 
 # shellcheck disable=SC1090
-. "$testdir"/test-functions
+. "$basedir"/test/test-functions

Places

File TEST-62-SKIPCPIO-V59-openQA.patch of Package dracut (Revision 3e2ad3168ecf719fb97860c15405377b)

Places