From 5e98d41e51dd55f8775fca9ce430b60635cabd36 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 25 Feb 2023 18:53:51 +0100 Subject: Refreshing test-installed.patch. Signed-off-by: Daniel Baumann --- debian/patches/debian/0008-test-installed.patch | 30 +++++++++++++++++++++++ debian/patches/series | 2 +- debian/patches/test-installed.patch | 32 ------------------------- 3 files changed, 31 insertions(+), 33 deletions(-) create mode 100644 debian/patches/debian/0008-test-installed.patch delete mode 100644 debian/patches/test-installed.patch diff --git a/debian/patches/debian/0008-test-installed.patch b/debian/patches/debian/0008-test-installed.patch new file mode 100644 index 0000000..dc962e9 --- /dev/null +++ b/debian/patches/debian/0008-test-installed.patch @@ -0,0 +1,30 @@ +Author: Felix Lechner +Description: Test installed files (Closes: #872118). + The test suite seems to check the executable bit on the local build product + 'mdadm' but runs all programs from the system PATH. This change should test + the installed version. + . + I believe this change tests the installed version, but that hypothesis is not + supported by much else. The autopkgtest restriction isolation-machine made it + difficult so far to run the test suite anywhere. + . + The entire setup is untested and may require further modification in order to + function. + . + Incorporates a suggestion from the fdisk maintainer to specify the fdisk + prerequisite explicitly. + +diff -Naurp mdadm.orig/tests/func.sh mdadm/tests/func.sh +--- mdadm.orig/tests/func.sh ++++ mdadm/tests/func.sh +@@ -101,10 +101,6 @@ check_env() { + echo "test: testing can only be done as 'root'." + exit 1 + } +- [ \! -x $mdadm ] && { +- echo "test: please run make everything before perform testing." +- exit 1 +- } + cmds=(mdadm lsblk df udevadm losetup mkfs.ext3 fsck seq) + for cmd in ${cmds[@]} + do diff --git a/debian/patches/series b/debian/patches/series index d08c03d..e845110 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,4 @@ debian/0004-exit-gracefully-when-md-device-not-found.patch debian/0005-sha1-includes.patch debian/0006-readlink-path.patch debian/0007-no-Werror.patch -test-installed.patch +debian/0008-test-installed.patch diff --git a/debian/patches/test-installed.patch b/debian/patches/test-installed.patch deleted file mode 100644 index 0fe678e..0000000 --- a/debian/patches/test-installed.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: Test installed files - The test suite seems to check the executable bit on the local build product - 'mdadm' but runs all programs from the system PATH. This change should test - the installed version. - . - I believe this change tests the installed version, but that hypothesis is not - supported by much else. The autopkgtest restriction isolation-machine made it - difficult so far to run the test suite anywhere. - . - The entire setup is untested and may require further modification in order to - function. - . - Incorporates a suggestion from the fdisk maintainer to specify the fdisk - prerequisite explicitly. -Author: Felix Lechner -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872118 -Forwarded: not-needed ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/tests/func.sh -+++ b/tests/func.sh -@@ -101,10 +101,6 @@ check_env() { - echo "test: testing can only be done as 'root'." - exit 1 - } -- [ \! -x $mdadm ] && { -- echo "test: please run make everything before perform testing." -- exit 1 -- } - cmds=(mdadm lsblk df udevadm losetup mkfs.ext3 fsck seq) - for cmd in ${cmds[@]} - do -- cgit v1.2.3