tighten up text display in sim test makefiles

tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent f9b210c76c
commit 3a2554fd94
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -46,19 +46,15 @@ build: ${BIN_DIR}/${BIN_FILE} compile-sketch
all: run all: run
run: ${BIN_DIR}/${BIN_FILE} run: ${BIN_DIR}/${BIN_FILE}
@echo "run"
"${BIN_DIR}/${BIN_FILE}" -t -q "${BIN_DIR}/${BIN_FILE}" -t -q
${BIN_DIR}/${BIN_FILE}: ${TEST_OBJS} ${BIN_DIR}/${BIN_FILE}: ${TEST_OBJS}
# We force sketch recompiliation because otherwise, make won't pick up changes to...anything on the arduino side # We force sketch recompiliation because otherwise, make won't pick up changes to...anything on the arduino side
compile-sketch: compile-sketch:
@echo "link"
@install -d "${BIN_DIR}" "${LIB_DIR}" @install -d "${BIN_DIR}" "${LIB_DIR}"
env LIBONLY=yes \ env LIBONLY=yes VERBOSE=${VERBOSE} LOCAL_CFLAGS="'-I$(shell pwd)'" \
LOCAL_CFLAGS="'-I$(shell pwd)'" \
OUTPUT_PATH="${LIB_DIR}" \ OUTPUT_PATH="${LIB_DIR}" \
VERBOSE=${VERBOSE} \
$(MAKE) -f ${top_dir}/testing/makefiles/delegate.mk compile $(MAKE) -f ${top_dir}/testing/makefiles/delegate.mk compile
$(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) -o "${BIN_DIR}/${BIN_FILE}" \ $(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) -o "${BIN_DIR}/${BIN_FILE}" \
-lpthread \ -lpthread \
@ -82,15 +78,14 @@ generate-testcase: $(if $(HAS_KTEST_FILE), ${SRC_DIR}/generated-testcase.cpp)
${SRC_DIR}/generated-testcase.cpp: test.ktest ${SRC_DIR}/generated-testcase.cpp: test.ktest
ifneq (,$(wildcard test.ktest)) ifneq (,$(wildcard test.ktest))
@echo "Compiling ${testcase} ktest script into ${SRC_DIR}/generated-testcase.cpp" $(info Compiling ${testcase} ktest script into ${SRC_DIR}/generated-testcase.cpp)
install -d "${SRC_DIR}" @install -d "${SRC_DIR}"
perl ${top_dir}/testing/bin/ktest-to-cxx \ perl ${top_dir}/testing/bin/ktest-to-cxx \
--ktest=test.ktest \ --ktest=test.ktest \
--cxx=${SRC_DIR}/generated-testcase.cpp --cxx=${SRC_DIR}/generated-testcase.cpp
endif endif
${OBJ_DIR}/%.o: ${SRC_DIR}/%.cpp ${OBJ_DIR}/%.o: ${SRC_DIR}/%.cpp
@echo "compile $@"
install -d "${OBJ_DIR}" install -d "${OBJ_DIR}"
$(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) \ $(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) \
-o "$@" -c -std=c++14 ${shared_includes} ${shared_defines} $< -o "$@" -c -std=c++14 ${shared_includes} ${shared_defines} $<

Loading…
Cancel
Save