aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2014-06-14 19:42:50 +0400
committerJohn Szakmeister <john@szakmeister.net>2014-06-18 16:21:12 -0400
commit2653cebcd7bdab690cab833b5e64fd15c88317cc (patch)
tree1db4ba3d9d31a9d27aae54d46b32e8224697c058
parent24a08b32ab1ef030607792409f7e801b9d388e82 (diff)
downloadrneovim-2653cebcd7bdab690cab833b5e64fd15c88317cc.tar.gz
rneovim-2653cebcd7bdab690cab833b5e64fd15c88317cc.tar.bz2
rneovim-2653cebcd7bdab690cab833b5e64fd15c88317cc.zip
Use MAKEOVERRIDES to pass SCRIPTS/TESTNUM arguments for `make test`
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9fd3e6f493..1429b00a63 100644
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,8 @@ ifneq (,$(USE_BUNDLED_DEPS))
BUNDLED_CMAKE_FLAG := -DUSE_BUNDLED=$(USE_BUNDLED_DEPS)
endif
-# For use where we want to make sure only a single job is run. This also avoids
-# any warnings from the sub-make.
+# For use where we want to make sure only a single job is run. This does issue
+# a warning, but we need to keep SCRIPTS argument.
SINGLE_MAKE = export MAKEFLAGS= ; $(MAKE)
all: nvim
@@ -75,7 +75,7 @@ endif
touch $@
test: | nvim
- +$(SINGLE_MAKE) -C src/nvim/testdir
+ +$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES)
unittest: | nvim
+$(BUILD_CMD) -C build unittest