diff options
| author | Jakob Unterwurzacher | 2023-05-17 15:20:20 +0200 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2023-05-17 15:21:20 +0200 |
| commit | 76d0f3ca7c491b39197e1a69c52b63c39455acfc (patch) | |
| tree | f85d66b2f5ab9b757a5f3a9f000bf04d49b2bc25 | |
| parent | 1a866b73731ce58b0ba31d80a2a84c84737c7d30 (diff) | |
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.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | tests/root_test/root_test.go | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -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) |