tests: use /var/tmp by default
On Fedora, /tmp is tmpfs, which behaves differently than ext4 (inode numbers are never reused, for example). Use /var/tmp, which is ext4 on Fedora, to get a more realistic test environment. This also allows us to drop the xattr workaround.
This commit is contained in:
parent
00af4f4864
commit
8c44294087
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [[ -z $TMPDIR ]]; then
|
if [[ -z $TMPDIR ]]; then
|
||||||
TMPDIR=/tmp
|
TMPDIR=/var/tmp
|
||||||
else
|
else
|
||||||
echo "Using TMPDIR=$TMPDIR"
|
echo "Using TMPDIR=$TMPDIR"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -44,14 +44,6 @@ var DefaultPlainDir string
|
||||||
// DefaultCipherDir is TmpDir + "/default-cipher"
|
// DefaultCipherDir is TmpDir + "/default-cipher"
|
||||||
var DefaultCipherDir string
|
var DefaultCipherDir string
|
||||||
|
|
||||||
// SwitchTMPDIR changes TMPDIR and hence the directory the test are performed in.
|
|
||||||
// This is used when you want to perform tests on a special filesystem. The
|
|
||||||
// xattr tests cannot run on tmpfs and use /var/tmp instead of /tmp.
|
|
||||||
func SwitchTMPDIR(newDir string) {
|
|
||||||
os.Setenv("TMPDIR", newDir)
|
|
||||||
doInit()
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
doInit()
|
doInit()
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,12 +23,6 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMain(m *testing.M) {
|
func TestMain(m *testing.M) {
|
||||||
// On modern Linux distributions, /tmp may be on tmpfs,
|
|
||||||
// which does not support user xattrs. Try /var/tmp instead
|
|
||||||
if !xattrSupported(test_helpers.TmpDir) && os.TempDir() == "/tmp" {
|
|
||||||
fmt.Printf("Switching from /tmp to /var/tmp for xattr tests\n")
|
|
||||||
test_helpers.SwitchTMPDIR("/var/tmp")
|
|
||||||
}
|
|
||||||
if !xattrSupported(test_helpers.TmpDir) {
|
if !xattrSupported(test_helpers.TmpDir) {
|
||||||
fmt.Printf("xattrs not supported on %q\n", test_helpers.TmpDir)
|
fmt.Printf("xattrs not supported on %q\n", test_helpers.TmpDir)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|
Loading…
Reference in New Issue