Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,15 @@ jobs:
export AUTOCONF_VERSION=2.72
export AUTOMAKE_VERSION=1.18

# autotools path: build only. "make check" additionally fails
# tests/LTbasic2 here with "opened regular file wasn't found";
# that test is not part of the legacy suite below and is left
# for a separate fix. libtool has to come from packages -- the
# base /usr/bin/libtool is a different program and aclocal
# autotools build and tests. libtool has to come from packages --
# the base /usr/bin/libtool is a different program and aclocal
# cannot find LT_INIT without the package's m4 files.
autoreconf -vif
mkdir /tmp/build
cd /tmp/build
"$src"/configure
make
make check || { cat test-suite.log; exit 1; }
cd "$src"

# legacy Configure, the path .builds/openbsd.yml covered
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ tests_LTunix_CFLAGS = @LSOF_TEST_CFLAGS@ -I$(top_srcdir)/include
if INSTALL_LIBLSOF
TESTS += tests/LTbasic2
check_PROGRAMS += tests/LTbasic2
tests_LTbasic2_CFLAGS = -I$(top_srcdir)/include
tests_LTbasic2_CFLAGS = @LSOF_TEST_CFLAGS@ -I$(top_srcdir)/include
tests_LTbasic2_LDADD = liblsof.la
endif

Expand Down
7 changes: 4 additions & 3 deletions tests/LTbasic2.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ int main(int argc, char **argv) {
/* check if fd matches */
if (f->fd_num == fd && f->inode == tmp_stat.st_ino &&
f->dev == tmp_stat.st_dev) {
#ifdef NETBSDV
/* on NetBSD, the file path for new created file may be
* unavailable, skip validation */
#if defined(LT_DIAL_netbsd) || defined(LT_DIAL_openbsd)
/* OpenBSD cannot report regular-file paths; NetBSD
* may not report paths for newly created files.
* Descriptor, inode, and device must still match. */
fd_found = 1;
#else
if (f->name && strstr(f->name, "LTbasic2-tmp")) {
Expand Down
Loading