aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--Makefile8
2 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 5872fd9386..c0ce35dc48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+# Build/deps dir
build/
.deps/
@@ -10,6 +11,8 @@ build/
src/po/vim.pot
src/po/*.ck
+
+# Files generated by the tests
src/testdir/mbyte.vim
src/testdir/mzscheme.vim
src/testdir/lua.vim
@@ -17,3 +20,6 @@ src/testdir/small.vim
src/testdir/tiny.vim
src/testdir/test*.out
src/testdir/test.log
+src/testdir/test.ok
+src/testdir/*.failed
+src/testdir/X*
diff --git a/Makefile b/Makefile
index 7b3611abf0..6e456022c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug
-test: build/src/vim
- cd src/testdir && make
-
build/src/vim: deps
cd build && make
+test: build/src/vim
+ cd src/testdir && make
+
deps: .deps/usr/lib/libuv.a
.deps/usr/lib/libuv.a:
@@ -22,3 +22,5 @@ clean:
done
.PHONY: test deps cmake
+
+.DEFAULT: build/src/vim