Skip to content

Commit

Permalink
Merge pull request #1365 from tlyu/ignore-more-races
Browse files Browse the repository at this point in the history
  • Loading branch information
obra authored Dec 11, 2023
2 parents 4fc45c1 + 8af753a commit 86b8b28
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ clean:
@$(SPHINXBUILD) -M clean "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

copy-plugin-readmes:
install -d plugins
-install -d plugins
(cd ../plugins; \
ls -d * |xargs -n 1 -I % cp %/README.md ../docs/plugins/%.md )


examples:
install -d examples
-install -d examples
(cd ../examples; \
find . -type f \( -name \*ino -or -name \*h -or -name \*cpp \) \
) | \
Expand Down
4 changes: 2 additions & 2 deletions testing/makefiles/libcommon.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ DEFAULT_GOAL: all
all: ${OBJ_FILES} ${LIB_DIR}/${LIB_FILE}

${LIB_DIR}/${LIB_FILE}: ${OBJ_FILES}
$(QUIET) install -d "${LIB_DIR}"
-$(QUIET) install -d "${LIB_DIR}"
$(QUIET) $(call _arduino_prop,compiler.ar.cmd) $(call _arduino_prop,compiler.ar.flags) "${LIB_DIR}/${LIB_FILE}" ${OBJ_FILES}

${OBJ_DIR}/%.o: ${top_dir}/testing/%.cpp ${H_FILES}
$(info compile $@)
$(QUIET) install -d "${OBJ_DIR}"
-$(QUIET) install -d "${OBJ_DIR}"
$(QUIET) $(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) -o "$@" -c -std=c++14 ${shared_includes} ${shared_defines} $<

clean:
Expand Down
6 changes: 3 additions & 3 deletions testing/makefiles/testcase.mk
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ${BIN_DIR}/${BIN_FILE}: compile-sketch
# We force sketch recompiliation because otherwise, make won't pick up changes to...anything on the arduino side
.PHONY: compile-sketch
compile-sketch: ${TEST_OBJS}
@install -d "${BIN_DIR}" "${LIB_DIR}"
-@install -d "${BIN_DIR}" "${LIB_DIR}"
$(QUIET) env LIBONLY=yes VERBOSE=${VERBOSE} \
OUTPUT_PATH="${LIB_DIR}" \
_ARDUINO_CLI_COMPILE_CUSTOM_FLAGS='--build-property upload.maximum_size=""' \
Expand All @@ -100,14 +100,14 @@ ifneq (,$(wildcard test.ktest))
ifdef VERBOSE
$(QUIET) $(info Compiling ${testcase} ktest script into ${SRC_DIR}/generated-testcase.cpp)
endif
$(QUIET) install -d "${SRC_DIR}"
-$(QUIET) install -d "${SRC_DIR}"
$(QUIET) perl ${top_dir}/testing/bin/ktest-to-cxx \
--ktest=test.ktest \
--cxx=${SRC_DIR}/generated-testcase.cpp
endif

${OBJ_DIR}/%.o: ${SRC_DIR}/%.cpp
$(QUIET) install -d "${OBJ_DIR}"
-$(QUIET) install -d "${OBJ_DIR}"
$(QUIET) $(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) -o "$@" -c -std=c++14 \
${shared_includes} ${include_plugins_dir} ${shared_defines} $<

Expand Down

0 comments on commit 86b8b28

Please sign in to comment.