From c66ceeea67abc80e8d0c3c7a4a681c59fe0aa276 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 17 Nov 2020 20:40:24 -0800 Subject: [PATCH] Don't pass in top_dir when we don't need to --- tests/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 0290bfd1..bb234b0d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -20,12 +20,12 @@ TESTS ?= $(shell cd $(tests_dir); find ${TEST_PATH} -name '*.ino' -exec dirname generate-testcases: @for test in ${TESTS}; do \ - ${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $${test} top_dir=${top_dir} testcase=$${test} generate-testcase; \ + ${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $${test} testcase=$${test} generate-testcase; \ done all: ${TESTS} @for test in ${TESTS}; do \ - ${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $${test} top_dir=${top_dir} testcase=$${test} run; \ + ${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $${test} testcase=$${test} run; \ done || exit 1 cmake-clean: @@ -33,7 +33,7 @@ cmake-clean: clean: cmake-clean @for test in ${TESTS}; do \ - ${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $${test} top_dir=${top_dir} testcase=$${test} clean; \ + ${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $${test} testcase=$${test} clean; \ done rm -rf "${build_dir}/*" @@ -51,7 +51,7 @@ Makefile: @: ${TESTS}: ${libcommon_a} googletest - ${MAKE} -f ${top_dir}/testing/makefiles/testcase.mk -C $@ top_dir=${top_dir} testcase=$@ build + ${MAKE} -f ${top_dir}/testing/makefiles/testcase.mk -C $@ testcase=$@ build %+run: - ${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $* top_dir=${top_dir} testcase=$* run + ${MAKE} -s -f ${top_dir}/testing/makefiles/testcase.mk -C $* testcase=$* run