From: Henrik Gombos Date: Sun, 4 Jun 2023 14:40:06 +0000 (+0000) Subject: test: add empty default test_cleanup implementation X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae7cd94b346ac7f4ce7ca6c236d1ecdaba1171a3;p=thirdparty%2Fdracut.git test: add empty default test_cleanup implementation --- diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index e63c9c0d3..5e19278eb 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -68,9 +68,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh index 4360dfec3..b574951df 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -73,9 +73,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh index 5c75e23f7..029d12f0f 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -93,9 +93,5 @@ test_setup() { rm -rf -- "$TESTDIR"/overlay } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh index b48c278d1..f54f7ebb5 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -160,9 +160,5 @@ EOF rm -rf -- "$TESTDIR"/overlay } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index d9121bb9c..28a1b0235 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -120,9 +120,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh index 2193ab56b..710fdf485 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -113,9 +113,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index b926dc981..1503476bc 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -156,9 +156,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh index e1a2aba1a..c491e5d9c 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -154,9 +154,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index 6db053ee6..61f3ad15a 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -144,9 +144,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh index 9c832d372..fe16e1b2f 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -119,9 +119,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh index 78f1c5bad..30b08b0f7 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -115,9 +115,5 @@ test_setup() { rm -rf -- "$TESTDIR"/overlay } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh index fa983dc37..aff5dc540 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -111,9 +111,5 @@ test_setup() { -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } -test_cleanup() { - return 0 -} - # shellcheck disable=SC1090 . "$testdir"/test-functions diff --git a/test/test-functions b/test/test-functions index b4de8c519..b0c538d95 100644 --- a/test/test-functions +++ b/test/test-functions @@ -20,6 +20,10 @@ command -v test_check &> /dev/null || test_check() { : } +command -v test_cleanup &> /dev/null || test_cleanup() { + : +} + # terminal sequence to set color to a 'success' color (currently: green) function SETCOLOR_SUCCESS() { echo -en '\033[0;32m'; } # terminal sequence to set color to a 'failure' color (currently: red)