about summary refs log tree commit homepage
path: root/t
diff options
context:
space:
mode:
Diffstat (limited to 't')
-rw-r--r--t/search.t12
-rw-r--r--t/v2writable.t3
2 files changed, 12 insertions, 3 deletions
diff --git a/t/search.t b/t/search.t
index 6415a644..35d71473 100644
--- a/t/search.t
+++ b/t/search.t
@@ -430,13 +430,23 @@ $ibx->with_umask(sub {
         is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB') if defined($art);
 });
 
+my $all_mask = 07777;
+my $dir_mask = 02770;
+
+# FreeBSD does not allow non-root users to set S_ISGID, so
+# git doesn't set it, either (see DIR_HAS_BSD_GROUP_SEMANTICS in git.git)
+if ($^O =~ /freebsd/i) {
+        $all_mask = 0777;
+        $dir_mask = 0770;
+}
+
 foreach my $f ("$git_dir/public-inbox/msgmap.sqlite3",
                 "$git_dir/public-inbox",
                 glob("$git_dir/public-inbox/xapian*/"),
                 glob("$git_dir/public-inbox/xapian*/*")) {
         my @st = stat($f);
         my ($bn) = (split(m!/!, $f))[-1];
-        is($st[2] & 07777, -f _ ? 0660 : 02770,
+        is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask,
                 "sharedRepository respected for $bn");
 }
 
diff --git a/t/v2writable.t b/t/v2writable.t
index 06b22519..f8ef415a 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -253,10 +253,9 @@ EOF
 }
 
 {
-        my @warn;
         my $x = 'x'x250;
         my $y = 'y'x250;
-        local $SIG{__WARN__} = sub { push @warn, @_ };
+        local $SIG{__WARN__} = sub {};
         $mime->header_set('Subject', 'long mid');
         $mime->header_set('Message-ID', "<$x>");
         ok($im->add($mime), 'add excessively long Message-ID');