From ab60a73b6a9cdd5685161a80a797a567876cd40d Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 16 May 2016 23:27:05 -0400 Subject: [PATCH] ci: test: Replace hard-coded commands with Makefile's targets --- .ci/common/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/common/test.sh b/.ci/common/test.sh index 8c32b63ab2..225d88e072 100644 --- a/.ci/common/test.sh +++ b/.ci/common/test.sh @@ -49,11 +49,11 @@ asan_check() { } run_unittests() { - ${MAKE_CMD} -C "${BUILD_DIR}" unittest + ${MAKE_CMD} unittest } run_functionaltests() { - if ! ${MAKE_CMD} -C "${BUILD_DIR}" ${FUNCTIONALTEST}; then + if ! ${MAKE_CMD} ${FUNCTIONALTEST}; then asan_check "${LOG_DIR}" valgrind_check "${LOG_DIR}" exit 1 @@ -63,7 +63,7 @@ run_functionaltests() { } run_oldtests() { - if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then + if ! make oldtest; then reset asan_check "${LOG_DIR}" valgrind_check "${LOG_DIR}"