From 275d45f47901243ae9f44e658a7fa718dd9dc417 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Fri, 18 Mar 2022 00:29:38 -0700
Subject: [PATCH] Hotfix for the macos compiler fixes for the virtual platform

---
 Makefile       | 2 +-
 tests/Makefile | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c85f5a71..42243cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ run-tests: $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/virtual/boards.txt bu
 	@: # blah
 
 build-gtest-gmock:
-	(cd testing/googletest && cmake -H. -Bbuild -DCMAKE_C_COMPILER=$(call _arduino_prop,compiler.path)/$(call _arduino_prop,compiler.c.cmd) -DCMAKE_CXX_COMPILER=$(call _arduino_prop,compiler.path)/$(call _arduino_prop,compiler.cpp.cmd)  .)
+	(cd testing/googletest && cmake -H. -Bbuild -DCMAKE_C_COMPILER=$(call _arduino_prop,compiler.path)$(call _arduino_prop,compiler.c.cmd) -DCMAKE_CXX_COMPILER=$(call _arduino_prop,compiler.path)$(call _arduino_prop,compiler.cpp.cmd)  .)
 	$(MAKE) -C testing/googletest
 
 adjust-git-timestamps:
diff --git a/tests/Makefile b/tests/Makefile
index b6ea71c4..28b0c12b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -15,6 +15,7 @@ export FQBN	?= keyboardio:virtual:model01
 
 TESTS		?= $(shell cd $(tests_dir); find ${TEST_PATH} -name '*.ino' -exec dirname {} \;)
 
+include $(top_dir)/etc/makefiles/arduino-cli.mk
 
 # If we start off in tests to run make all, the sketch makefiles guess the wrong location for
 # Kaliedoscope's makefiles
@@ -54,7 +55,7 @@ googletest: ${top_dir}/testing/googletest/build/Makefile
 
 ${top_dir}/testing/googletest/build/Makefile:
 	$(info googletest Makefile is being remade)
-	install -d ${top_dir}/testing/googletest/build && cd ${top_dir}/testing/googletest/build && cmake ..
+	install -d ${top_dir}/testing/googletest/build && cd ${top_dir}/testing/googletest/build && cmake  -DCMAKE_C_COMPILER=$(call _arduino_prop,compiler.path)$(call _arduino_prop,compiler.c.cmd) -DCMAKE_CXX_COMPILER=$(call _arduino_prop,compiler.path)$(call _arduino_prop,compiler.cpp.cmd) ..
 
 ${libcommon_a}:
 	${MAKE} -f ${top_dir}/testing/makefiles/libcommon.mk -C ${top_dir}/testing