From 76d0f3ca7c491b39197e1a69c52b63c39455acfc Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Wed, 17 May 2023 15:20:20 +0200 Subject: [PATCH] tests: root_test: use TMPDIR=/var/tmp Otherwise we fail like this on my Fedora 38 box: === RUN TestOverlay DetectQuirks: tmpfs detected, no extended attributes except acls will work. root_test.go:379: No user xattrs! overlay mount will likely fail. 15:15:57.957960 Unimplemented opcode OPCODE-51 root_test.go:398: mount: /tmp/gocryptfs-test-parent-0/3652394902/TestOverlay.2374697046.mnt/merged: wrong fs type, bad option, bad superblock on overlay, missing codepage or helper program, or other error. dmesg(1) may have more information after failed mount system call. root_test.go:399: exit status 32 --- FAIL: TestOverlay (0.04s) FAIL Also fix the messed-up DetectQuirks bit test. --- Makefile | 3 ++- tests/root_test/root_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d69894b..8cf583a 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,8 @@ test: .phony: root_test root_test: ./build.bash - cd tests/root_test && go test -c && sudo ./root_test.test -test.v + # Need to use TMPDIR=/var/tmp as TestOverlay fails on tmpfs. + cd tests/root_test && go test -c && sudo TMPDIR=/var/tmp ./root_test.test -test.v .phony: format format: diff --git a/tests/root_test/root_test.go b/tests/root_test/root_test.go index c4ed7db..23b44d0 100644 --- a/tests/root_test/root_test.go +++ b/tests/root_test/root_test.go @@ -375,7 +375,7 @@ func TestOverlay(t *testing.T) { t.Skip("must run as root") } cDir := test_helpers.InitFS(t) - if syscallcompat.DetectQuirks(cDir)|syscallcompat.QuirkNoUserXattr != 0 { + if syscallcompat.DetectQuirks(cDir)&syscallcompat.QuirkNoUserXattr != 0 { t.Logf("No user xattrs! overlay mount will likely fail.") } os.Chmod(cDir, 0755)