Merge pull request #271 from lsof-org/fix-freebsd-tests

Fix freebsd tests
lsof-org · Jan 16, 2023 · 229f41a · 229f41a
2 parents 0298955 + 205ebef
commit 229f41a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 2 deletions.
diff --git a/Configure b/Configure
@@ -1178,6 +1178,7 @@ case $LSOF_TGT in	# {
 
   freebsd)
     LSOF_FBSD_ZFS=0
+    LSOF_TSTKMEM=0
     if test "X$LSOF_CC" = "X"	# {
     then
       LSOF_CC=cc

diff --git a/tests/LTbasic.c b/tests/LTbasic.c
@@ -414,7 +414,7 @@ tstlsof(texec, tkmem, tproc)
 	     */
 		if (!devp || !inop)
 		    break;
-	        if ((cem = ConvLsofDev(devp->v, &lsofdc))) {
+	        if ((cem = ConvLsofDev(devp->v, &tmpdc))) {
 		    if (pem)
 			(void) PrtMsg(pem, Pn);
 		    pem = cem;

diff --git a/tests/LTlib.c b/tests/LTlib.c
@@ -109,7 +109,6 @@ static char copyright[] =
 # if	defined(LT_DEV64)
 #undef	X2DEV_T
 #define	X2DEV_T		unsigned long long
-#define	major_X(dp, em)	((int)((x2dev(dp, em) >> 32) & 0xffffffff))
 # endif	/* defined(LT_DEV64) */
 #endif	/* defined(LT_DIAL_freebsd) */
 

diff --git a/tests/LTnlink.c b/tests/LTnlink.c
@@ -247,6 +247,10 @@ main(argc, argv)
 	    Pn);
 	do_unlink = 0;
     }
+#if	defined(LT_DIAL_freebsd)
+	// See https://github.com/lsof-org/lsof/issues/264, unlinked files are not found by lsof
+	do_unlink = 0;
+#endif
 /*
  * Find the test file.
  */

diff --git a/tests/LsofTest.h b/tests/LsofTest.h
@@ -166,6 +166,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#undef	USE_LSOF_C_OPT
 # endif	/* defined(LT_DIAL_freebsd) */
 
 

diff --git a/tests/TestDB b/tests/TestDB
@@ -142,6 +142,9 @@ LT_BIGF LT_CC LT_DIAL_uw LT_KMEM LT_VERS=70101
 LT_BIGF LT_CC LT_DIAL_uw LT_KMEM LT_VERS=70103
 LT_BIGF LT_CC LT_DIAL_uw LT_KMEM LT_VERS=70104
 LT_BIGF LT_CC LT_DEV64 LT_DIAL_freebsd LT_KMEM LT_VERS=13000
+LT_BIGF LT_CC LT_DEV64 LT_DIAL_freebsd LT_VERS=12000
+LT_BIGF LT_CC LT_DEV64 LT_DIAL_freebsd LT_VERS=13000
+LT_BIGF LT_CC LT_DEV64 LT_DIAL_freebsd LT_VERS=14000
 LT_BIGF LT_CC LT_DIAL_linux LT_VERS=50009 _FILE_OFFSET_BITS=64
 LT_BIGF LT_CC LT_DIAL_linux LT_VERS=60005 _FILE_OFFSET_BITS=64
 LT_CC LT_DIAL_darwin LT_VERS=1900