diff options
author | Eric Wong <e@80x24.org> | 2023-12-13 00:50:16 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2023-12-13 09:01:53 +0000 |
commit | ee5cf0a3af06184d7f26b5c482855f43b4b727fe (patch) | |
tree | 4399d64ae5bfddf5b423d60caf6a770f52fa5693 | |
parent | 48f0a0148cfa0f1caef53aa2bad4196aac381f20 (diff) | |
download | public-inbox-ee5cf0a3af06184d7f26b5c482855f43b4b727fe.tar.gz |
My user home directory on Alpine has S_ISGID set on it and every subdirectory inherits it. This includes my work tree and the t/data-gen/* subdirectories. So just ignore the presence (or non-presence) of the S_ISGID bit on directories descended from the cached t/data-gen/* directories. Now, public-inbox-convert may want to preserve S_ISGID on the newly-created v2 inbox, but that's a separate discussion.
-rw-r--r-- | t/convert-compact.t | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/convert-compact.t b/t/convert-compact.t index c7b7f77e..b123f17b 100644 --- a/t/convert-compact.t +++ b/t/convert-compact.t @@ -35,14 +35,14 @@ EOF $im->add($eml) or BAIL_OUT '->add'; }; umask(077) or BAIL_OUT "umask: $!"; -oct_is(((stat("$ibx->{inboxdir}/public-inbox"))[2]) & 07777, 0755, +oct_is(((stat("$ibx->{inboxdir}/public-inbox"))[2]) & 05777, 0755, 'sharedRepository respected for v1'); -oct_is(((stat("$ibx->{inboxdir}/public-inbox/msgmap.sqlite3"))[2]) & 07777, +oct_is(((stat("$ibx->{inboxdir}/public-inbox/msgmap.sqlite3"))[2]) & 05777, 0644, 'sharedRepository respected for v1 msgmap'); my @xdir = glob("$ibx->{inboxdir}/public-inbox/xap*/*"); foreach (@xdir) { my @st = stat($_); - oct_is($st[2] & 07777, -f _ ? 0644 : 0755, + oct_is($st[2] & 05777, -f _ ? 0644 : 0755, 'sharedRepository respected on file after convert'); } @@ -55,7 +55,7 @@ ok(run_script($cmd, undef, $rdr), 'v1 compact works'); @xdir = glob("$ibx->{inboxdir}/public-inbox/xap*"); is(scalar(@xdir), 1, 'got one xapian directory after compact'); -oct_is(((stat($xdir[0]))[2]) & 07777, 0755, +oct_is(((stat($xdir[0]))[2]) & 05777, 0755, 'sharedRepository respected on v1 compact'); my $hwm = do { @@ -71,7 +71,7 @@ ok(run_script($cmd, undef, $rdr), 'convert --no-index works'); $cmd = [ '-convert', $ibx->{inboxdir}, "$tmpdir/x/v2" ]; ok(run_script($cmd, undef, $rdr), 'convert works'); @xdir = glob("$tmpdir/x/v2/xap*/*"); -foreach (@xdir) { +for (@xdir) { # TODO: should public-inbox-convert preserve S_ISGID bit? my @st = stat($_); oct_is($st[2] & 07777, -f _ ? 0644 : 0755, 'sharedRepository respected after convert'); |