Skip test_resolve_swap if the root directory is not writable

k-takata · Dec 31, 2015 · 59be977 · 59be977
1 parent 0dc4c21
commit 59be977
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
@@ -141,7 +141,8 @@ SCRIPTS_MORE2 = \
 	test25.out \
 	test27.out \
 	test49.out \
-	test97.out
+	test97.out \
+	test_resolve_swap.out
 
 
 # Tests that run on most systems, but not MingW and Cygwin.

diff --git a/src/testdir/test_resolve_swap.in b/src/testdir/test_resolve_swap.in
@@ -1,5 +1,5 @@
 Tests for swap file detection.
-This test failed, if root '/' directory not writable.
+This test is skipped, if root '/' directory not writable.
 
 STARTTEST
 :so small.vim
@@ -13,8 +13,9 @@ STARTTEST
 :  let link = 'Xlink1'
 :  let linkswap = '.'.link.'.swp'
 :  if !filewritable(dir) || glob(file)
-:    " failed
-:    return
+:    " The root directory is not writable. Skip this.
+:    e! test.ok
+:    wq! test.out
 :  endif
 :  call writefile([], file)
 :  exe '!ln -sfL' file link