Skip to content

Fix freebsd tests #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiegec merged 3 commits into from
Jan 16, 2023
Merged

Fix freebsd tests #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8060641
[freebsd] Disable kmem check and remove wrong major_X for LTbasic
jiegec Jan 13, 2023
d9b74a5
[freebsd] Disable unlink test because unlinked files are not listed
jiegec Jan 13, 2023
205ebef
[freebsd] Add FreeBSD 12/14 to TestDB
jiegec Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/LTbasic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion tests/LTlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) */

Expand Down
4 changes: 4 additions & 0 deletions tests/LTnlink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
1 change: 1 addition & 0 deletions tests/LsofTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/wait.h>
#undef USE_LSOF_C_OPT
# endif /* defined(LT_DIAL_freebsd) */


Expand Down
3 changes: 3 additions & 0 deletions tests/TestDB
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down