hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

macos: tests: fix deleting of scratch dir

Browse Source 
macos rm does not understand --one-file-system,
and it cannot handle unreadable directories.
This commit is contained in:
Jakob Unterwurzacher 2018-03-05 23:40:08 +01:00
parent 18d4159d18
commit 4732e33a9a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/syscallcompat/emulate_test.go
View File

@ -245,7 +245,7 @@ func TestEmulateSymlinkat(t *testing.T) {
}
func TestEmulateMkdirat(t *testing.T) {
err := emulateMkdirat(tmpDirFd, "mkdirat", 0100)
err := emulateMkdirat(tmpDirFd, "mkdirat", 0700)
if err != nil {
t.Fatal(err)
}
@ -257,7 +257,7 @@ func TestEmulateMkdirat(t *testing.T) {
t.Fatalf("mkdirat did not create a directory")
}
// Test with absolute path
err = emulateMkdirat(-1, tmpDir+"/mkdirat2", 0100)
err = emulateMkdirat(-1, tmpDir+"/mkdirat2", 0700)
if err != nil {
t.Fatal(err)
}

7
test.bash
View File

@ -49,7 +49,12 @@ go test -count 1 ./... "$@" 200>&-
# The tests cannot to this themselves as they are run in parallel.
# Don't descend into possibly still mounted example filesystems.
rm -Rf --one-file-system $TESTDIR
if [[ $OSTYPE == *linux* ]] ; then
rm -Rf --one-file-system $TESTDIR
else
# MacOS "rm" does not understand "--one-file-system"
rm -Rf $TESTDIR
fi
if grep -R "panic(" internal ; then
echo "Please use log.Panic instead of naked panic!"