From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/4] tests: note kevent+tmpfs failures on DragonFly <= 6.4
Date: Fri, 1 Dec 2023 02:07:04 +0000 [thread overview]
Message-ID: <20231201020705.2752562-4-e@80x24.org> (raw)
In-Reply-To: <20231201020705.2752562-1-e@80x24.org>
I forgot to set TMPDIR=/path/to/non-tmpfs again.
---
lib/PublicInbox/TestCommon.pm | 23 ++++++++++++++++++++++-
t/dir_idle.t | 7 +++++--
t/kqnotify.t | 2 +-
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 8e7eb950..f2914d09 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -24,7 +24,7 @@ BEGIN {
@EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods
run_script start_script key2sub xsys xsys_e xqx eml_load tick
have_xapian_compact json_utf8 setup_public_inboxes create_inbox
- create_coderepo require_bsd
+ create_coderepo require_bsd kernel_version check_broken_tmpfs
quit_waiter_pipe wait_for_eof
tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt
test_httpd xbail require_cmd is_xdeeply tail_f
@@ -37,6 +37,27 @@ BEGIN {
push @EXPORT, @methods;
}
+sub kernel_version () {
+ state $version = do {
+ require POSIX;
+ my @u = POSIX::uname();
+ if ($u[2] =~ /\A([0-9]+(?:\.[0-9]+)+)/) {
+ eval "v$1";
+ } else {
+ local $" = "', `";
+ diag "Unable to get kernel version from: `@u'";
+ undef;
+ }
+ };
+}
+
+sub check_broken_tmpfs () {
+ return if $^O ne 'dragonfly' || kernel_version ge v6.5;
+ diag 'EVFILT_VNODE + tmpfs is broken on dragonfly <= 6.4 (have: '.
+ sprintf('%vd', kernel_version).')';
+ 1;
+}
+
sub require_bsd (;$) {
state $ok = ($^O =~ m!\A(?:free|net|open)bsd\z! ||
$^O eq 'dragonfly');
diff --git a/t/dir_idle.t b/t/dir_idle.t
index 14aad7a1..8d085d6e 100644
--- a/t/dir_idle.t
+++ b/t/dir_idle.t
@@ -16,10 +16,12 @@ my $end = 3 + now;
local @PublicInbox::DS::post_loop_do = (sub { scalar(@x) == 0 && now < $end });
rmdir("$tmpdir/a/b") or xbail "rmdir $!";
PublicInbox::DS::event_loop();
-is(scalar(@x), 1, 'got an rmdir event') or xbail explain(\@x);
-if (@x) {
+if (is(scalar(@x), 1, 'got an rmdir event')) {
is($x[0]->[0]->fullname, "$tmpdir/a/b", 'got expected fullname') and
ok($x[0]->[0]->IN_DELETE, 'IN_DELETE set');
+} else {
+ check_broken_tmpfs;
+ xbail explain(\@x);
}
rmdir("$tmpdir/a") or xbail "rmdir $!";
@@ -30,6 +32,7 @@ if (is(scalar(@x), 1, 'got an event after rmdir')) {
is($x[0]->[0]->fullname, "$tmpdir/a", 'got expected fullname') and
ok($x[0]->[0]->IN_DELETE_SELF, 'IN_DELETE_SELF set');
} else {
+ check_broken_tmpfs;
diag explain(\@x);
}
rename("$tmpdir/c", "$tmpdir/j") or xbail "rmdir $!";
diff --git a/t/kqnotify.t b/t/kqnotify.t
index cf32b633..add477a4 100644
--- a/t/kqnotify.t
+++ b/t/kqnotify.t
@@ -62,6 +62,6 @@ is_xdeeply($hit, \@unlink, 'unlinked files match');
# this is unreliable on Dragonfly tmpfs (fixed post-6.4)
rmdir "$tmpdir/new";
$hit = [ sort(map { $_->fullname } $kqn->read) ];
-is(scalar(@$hit), 1, 'detected self removal');
+is(scalar(@$hit), 1, 'detected self removal') or check_broken_tmpfs;
done_testing;
next prev parent reply other threads:[~2023-12-01 2:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-01 2:07 [PATCH 0/4] DragonFly-related fixes Eric Wong
2023-12-01 2:07 ` [PATCH 1/4] t/xap_helper: make sendmsg errors more obvious Eric Wong
2023-12-01 2:07 ` [PATCH 2/4] xap_helper.h: fix non-assignable stderr case Eric Wong
2023-12-01 2:07 ` Eric Wong [this message]
2023-12-01 2:07 ` [PATCH 4/4] xap_helper: enable stderr assignment on DragonFly Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231201020705.2752562-4-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).