more test make output cleanup. no intentional functional changes

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

@ -80,7 +80,7 @@ port := $(shell $(ARDUINO_CLI) board list --format=text | grep $(FQBN) |cut -d'
$(SKETCH_FILE_PATH): $(SKETCH_FILE_PATH):
@echo "Sketch is $(SKETCH_FILE_PATH)" $(info Sketch is $(SKETCH_FILE_PATH))
.PHONY: compile configure-arduino-cli install-arduino-core-kaleidoscope install-arduino-core-avr .PHONY: compile configure-arduino-cli install-arduino-core-kaleidoscope install-arduino-core-avr
@ -127,14 +127,13 @@ clean:
compile: compile:
install -d "${OUTPUT_PATH}" install -d "${OUTPUT_PATH}"
@echo "Building ${SKETCH_FILE_PATH}" @echo "Building ${SKETCH_FILE_PATH}"
$(ARDUINO_CLI) compile \ $(ARDUINO_CLI) compile --fqbn "${FQBN}" ${ARDUINO_VERBOSE} \
--fqbn "${FQBN}" \
--libraries "${KALEIDOSCOPE_PLATFORM_LIB_DIR}" \ --libraries "${KALEIDOSCOPE_PLATFORM_LIB_DIR}" \
--build-path "${BUILD_PATH}" \ --build-path "${BUILD_PATH}" \
--output-dir "${OUTPUT_PATH}" \ --output-dir "${OUTPUT_PATH}" \
--build-cache-path "${CORE_CACHE_PATH}" \ --build-cache-path "${CORE_CACHE_PATH}" \
--build-properties "compiler.cpp.extra_flags=${LOCAL_CFLAGS}" \ --build-properties "compiler.cpp.extra_flags=${LOCAL_CFLAGS}" \
--warnings all ${ARDUINO_VERBOSE} ${ccache_wrapper_property} \ --warnings all ${ccache_wrapper_property} \
"${SKETCH_FILE_PATH}" "${SKETCH_FILE_PATH}"
ifeq ($(LIBONLY),) ifeq ($(LIBONLY),)
@cp "${BUILD_PATH}/${SKETCH_FILE_NAME}.hex" "${HEX_FILE_PATH}" @cp "${BUILD_PATH}/${SKETCH_FILE_NAME}.hex" "${HEX_FILE_PATH}"

@ -57,18 +57,11 @@ compile-sketch:
OUTPUT_PATH="${LIB_DIR}" \ OUTPUT_PATH="${LIB_DIR}" \
$(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 -g -w ${TEST_OBJS} \
-g \ -L"${COMMON_LIB_DIR}" -lcommon \
-w \
${TEST_OBJS} \
-L"${COMMON_LIB_DIR}" \
-lcommon \
"${LIB_DIR}/${LIB_FILE}" \ "${LIB_DIR}/${LIB_FILE}" \
-L"${top_dir}/testing/googletest/build/lib" \ -L"${top_dir}/testing/googletest/build/lib" \
-lgtest \ -lgtest -lgmock -lpthread -lm
-lgmock \
-lpthread \
-lm
# If we have a test.ktest file, it should be processed into a c++ testcase # If we have a test.ktest file, it should be processed into a c++ testcase
@ -86,9 +79,9 @@ ifneq (,$(wildcard test.ktest))
endif endif
${OBJ_DIR}/%.o: ${SRC_DIR}/%.cpp ${OBJ_DIR}/%.o: ${SRC_DIR}/%.cpp
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 \
-o "$@" -c -std=c++14 ${shared_includes} ${shared_defines} $< ${shared_includes} ${shared_defines} $<
clean: clean:
rm -f -- "${SRC_DIR}/generated-testcase.cpp" rm -f -- "${SRC_DIR}/generated-testcase.cpp"

Loading…
Cancel
Save