summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--tests/root_test/root_test.go2
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)