diff options
| -rwxr-xr-x | test.bash | 2 | ||||
| -rw-r--r-- | tests/test_helpers/helpers.go | 8 | ||||
| -rw-r--r-- | tests/xattr/xattr_integration_test.go | 6 |
3 files changed, 1 insertions, 15 deletions
@@ -1,7 +1,7 @@ #!/bin/bash if [[ -z $TMPDIR ]]; then - TMPDIR=/tmp + TMPDIR=/var/tmp else echo "Using TMPDIR=$TMPDIR" fi diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go index df71e52..17d2f98 100644 --- a/tests/test_helpers/helpers.go +++ b/tests/test_helpers/helpers.go @@ -44,14 +44,6 @@ var DefaultPlainDir string // DefaultCipherDir is TmpDir + "/default-cipher" 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() { doInit() } diff --git a/tests/xattr/xattr_integration_test.go b/tests/xattr/xattr_integration_test.go index 29c3e84..b091830 100644 --- a/tests/xattr/xattr_integration_test.go +++ b/tests/xattr/xattr_integration_test.go @@ -23,12 +23,6 @@ import ( ) 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) { fmt.Printf("xattrs not supported on %q\n", test_helpers.TmpDir) os.Exit(1) |