From 2653cebcd7bdab690cab833b5e64fd15c88317cc Mon Sep 17 00:00:00 2001 From: ZyX Date: Sat, 14 Jun 2014 19:42:50 +0400 Subject: Use MAKEOVERRIDES to pass SCRIPTS/TESTNUM arguments for `make test` --- Makefile | 6 +++--- 1 file 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 -- cgit