Subject: Re: bug#44953: lsof: LTlock test consistently fails (possibly due to btrfs)

From: Mark H Weaver <[email-masked]>
Date: Fri, 15 Oct 2021 05:11:20 -0400

Hi Maxim,

Maxim Cournoyer <[email-masked]> writes:

> For the record it seems Tobias had gotten around filing a bug here:
> https://github.com/lsof-org/lsof/issues/152.
>
> It seems the issue is real and a new Linux-specific tool lsfd is being
> devised.  I guess we should disable the test, as the package is still
> probably mostly functional on Btrfs, and wait for a proper resolution
> from upstream?
>
> Mark, could you share your patch disabling the test if you still have it
> handy?

Here's what I did on my private branch, which has diverged quite a bit
from master, so I don't know whether it will apply cleanly.

>From 1a658341538b8ea1470ef1bd02dfb3922011df79 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <[email-masked]>
Date: Sun, 29 Nov 2020 16:03:57 -0500
Subject: [PATCH] Revert "gnu: lsof: Make test failures fatal."

This reverts commit 2bf502138c9c8cad945866061772fe0e1f4b7175.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/lsof.scm                         |  3 +-
 .../patches/lsof-fatal-test-failures.patch    | 58 -------------------
 3 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 gnu/packages/patches/lsof-fatal-test-failures.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index eaa358266a..f53ceb35e9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1378,7 +1378,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/lm-sensors-hwmon-attrs.patch		\
   %D%/packages/patches/lrcalc-includes.patch    		\
   %D%/packages/patches/lsh-fix-x11-forwarding.patch		\
-  %D%/packages/patches/lsof-fatal-test-failures.patch		\
   %D%/packages/patches/lua-CVE-2014-5461.patch                      \
   %D%/packages/patches/lua-pkgconfig.patch                      \
   %D%/packages/patches/lua51-liblua-so.patch                    \
diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm
index b317902ee7..3e527a272f 100644
--- a/gnu/packages/lsof.scm
+++ b/gnu/packages/lsof.scm
@@ -41,8 +41,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp"))
-      (patches (search-patches "lsof-fatal-test-failures.patch"))))
+       (base32 "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("groff" ,groff)                  ; for soelim
diff --git a/gnu/packages/patches/lsof-fatal-test-failures.patch b/gnu/packages/patches/lsof-fatal-test-failures.patch
deleted file mode 100644
index e874ba6ad4..0000000000
--- a/gnu/packages/patches/lsof-fatal-test-failures.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Tobias Geerinckx-Rice <[email-masked]>
-Date: Mon, 23 Nov 2020 05:36:53 +0100
-Subject: [PATCH] gnu: lsof: Make test failures fatal.
-
-Submitted upstream[0].
-
-[0]: https://github.com/lsof-org/lsof/pull/144
-
-diff --git a/tests/Makefile b/tests/Makefile
-index 08574a0..2923bb8 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -27,7 +27,7 @@ all:	${CKTSTDB} ${BASTST} ${STDTST} FRC
- 	  exit 1 ;\
- 	fi
- 	@rm -f config.LT*
--	-@err=0; \
-+	@err=0; \
- 	echo ""; \
- 	echo "Basic test:"; \
- 	./${BASTST}; \
-@@ -54,8 +54,11 @@ all:	${CKTSTDB} ${BASTST} ${STDTST} FRC
- 	    echo "Suggestion: try the optional tests: \"make opt\""; \
- 	    echo ""; \
- 	  fi; \
--	fi;
--	@rm -f config.LT*
-+	fi; \
-+	rm -f config.LT*; \
-+	if [ $$err -ne 0 ]; then \
-+	  exit 1; \
-+	fi
- 
- auto:	ckDB silent FRC
- 
-@@ -112,7 +115,7 @@ LTunix: LTunix.c ${CONFIG} ${LIBOBJ} ${HDR} config.ldflags
- 
- opt:	${CKTSTDB} ${OPTTST} FRC
- 	@rm -f config.LT*
--	-@err=0; \
-+	@err=0; \
- 	echo ""; \
- 	echo "Optional tests:"; \
- 	for i in ${OPTTST}; do \
-@@ -126,8 +129,11 @@ opt:	${CKTSTDB} ${OPTTST} FRC
- 	else \
- 	  echo "All optional tests succeeded."; \
- 	fi; \
--	echo "";
--	@rm -f config.LT*
-+	echo ""; \
-+	rm -f config.LT*; \
-+	if [ $$err -ne 0 ]; then \
-+	  exit 1; \
-+	fi
- 
- optional: opt
- 
-- 
2.31.1

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about <https://stallmansupport.org>.