aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Reed <m.reed@mykolab.com>2015-11-27 18:08:08 -0500
committerMichael Reed <m.reed@mykolab.com>2015-11-27 18:08:15 -0500
commit54b0c09685096d583638c1bd5cceac9055e9d8be (patch)
treec69cd84ebac9c534ebbd7e2e25b47dcf5f391ece
parent951714ede63beb324c3ffb4d326ba1c5a47a36ea (diff)
downloadrneovim-54b0c09685096d583638c1bd5cceac9055e9d8be.tar.gz
rneovim-54b0c09685096d583638c1bd5cceac9055e9d8be.tar.bz2
rneovim-54b0c09685096d583638c1bd5cceac9055e9d8be.zip
Make `make test` run unit tests too
refs https://github.com/neovim/neovim/pull/2124#discussion_r26107174 Unlike Travis, `make test` currently only runs functional tests. This can cause confusion since one might (understandably) think that `make test` runs unit tests too, which it doesn't. The `oldtest` target is still left out because it's quite slow and Travis already runs it.
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 343307eb2b..1fc15e1312 100644
--- a/Makefile
+++ b/Makefile
@@ -89,14 +89,14 @@ functionaltest: | nvim
testlint: | nvim
$(BUILD_CMD) -C build testlint
-test: functionaltest
-
unittest: | nvim
+$(BUILD_CMD) -C build unittest
benchmark: | nvim
+$(BUILD_CMD) -C build benchmark
+test: functionaltest unittest
+
clean:
+test -d build && $(BUILD_CMD) -C build clean || true
$(MAKE) -C src/nvim/testdir clean