Fix some quirks with build dir finding especially on Travis CI

Signed-off-by: Squareys <[email protected]>

Author: Squareys

plugin/cmake.vim

@@ -34,11 +34,11 @@ function! s:find_build_dir()
   endif
 
   let g:cmake_build_dir = get(g:, 'cmake_build_dir', 'build')
-  let b:build_dir = finddir(g:cmake_build_dir, expand(".") . ';')
+  let b:build_dir = finddir(g:cmake_build_dir, ';')
 
   if b:build_dir == ""
     " Find build directory in path of current file
-    let b:build_dir = finddir(g:cmake_build_dir, expand("%:p:h") . ';')
+    let b:build_dir = finddir(g:cmake_build_dir, s:fnameescape(expand("%:p:h")) . ';')
   endif
 
   if b:build_dir != ""

test/cmake.vader

@@ -8,26 +8,31 @@ Before:
     let test_dir = fnamemodify(getcwd(), ':p')
   endif
 
-  Assert !isdirectory("test project/build"), "TEST ERROR: build directory was not properly deleted"
-  echo system("mkdir 'test project/build'")
-  Assert isdirectory("test project/build"), "TEST ERROR: build directory was not created"
+  Assert !isdirectory("test project/tmp-build"), "TEST ERROR: build directory was not properly deleted"
+  echo system("mkdir 'test project/tmp-build'")
+  Assert isdirectory("test project/tmp-build"), "TEST ERROR: build directory was not created"
 
+  " Under travis CI the entire project is in a build/ directory
+  " which will make the search from cwd always return a result.
+  " To be able to test searching build dir from current file, the
+  " build dir needs to be named differently as a workaround.
+  let g:cmake_build_dir = "tmp-build"
 After:
   exec "cd" fnameescape(test_dir)
-  echo system("rm -rf 'test project/build'")
+  echo system("rm -rf 'test project/tmp-build'")
   echo system("rm -f 'test project/compile_commands.json'")
 
 Execute (Find build directory from working dir):
   cd test\ project
   CMake
 
-  Assert filereadable("build/CMakeCache.txt"), "CMakeCache.txt should be generated"
-  Assert !filereadable("build/compile_commands.json"), "Compile commands should not be exported by default"
+  Assert filereadable("tmp-build/CMakeCache.txt"), "CMakeCache.txt should be generated"
+  Assert !filereadable("tmp-build/compile_commands.json"), "Compile commands should not be exported by default"
 
 Execute (Find build directory from currently open file):
   e test\ project/CMakeLists.txt
   CMake
-  Assert filereadable("test project/build/CMakeCache.txt"), "CMakeCache.txt should be generated"
+  Assert filereadable("test project/tmp-build/CMakeCache.txt"), "CMakeCache.txt should be generated"
 
 Execute (Create symlink to compilation database):
   let g:cmake_export_compile_commands = 1
@@ -37,12 +42,12 @@ Execute (Create symlink to compilation database):
 
   " Exporting compile commands does not work with Visual Studio generator
   if !has("win32") && !has("win32unix")
-    Assert filereadable("build/compile_commands.json"), "Compile commands should be exported"
+    Assert filereadable("tmp-build/compile_commands.json"), "Compile commands should be exported"
     Assert filereadable(resolve("compile_commands.json")), "A symlink should be generated"
   endif
 
 Execute (Open already configured cmake project):
-  cd test\ project/build
+  cd test\ project/tmp-build
   silent !cmake .. -DWITH_BYE=ON
   e ../CMakeLists.txt
   CMake