From 463b17fc706701f0a470fe0d7eb839705756c787 Mon Sep 17 00:00:00 2001
From: david gauchard <gauchard@laas.fr>
Date: Fri, 4 Dec 2020 02:12:50 +0100
Subject: [PATCH 1/2] emulation on host: makefile minor fixes

---
 tests/host/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/host/Makefile b/tests/host/Makefile
index bad575d9c2..9f46db22f8 100644
--- a/tests/host/Makefile
+++ b/tests/host/Makefile
@@ -73,6 +73,7 @@ $(shell mkdir -p $(BINDIR))
 
 CORE_CPP_FILES := \
 	$(addprefix $(abspath $(CORE_PATH))/,\
+		debug.cpp \
 		StreamString.cpp \
 		Stream.cpp \
 		WString.cpp \
@@ -226,7 +227,10 @@ test: $(OUTPUT_BINARY)			# run host test for CI
 	$(OUTPUT_BINARY)
 
 .PHONY: clean
-clean: clean-objects
+clean: clean-lcov clean-objects
+
+.PHONY: clean-lcov
+clean-lcov:
 	rm -rf $(LCOV_DIRECTORY)
 
 .PHONY: clean-objects
@@ -392,7 +396,7 @@ else
 	$(VERBLD) $(CXX) $(LDFLAGS) $< $(BINDIR)/fullcore.a $(LIBSSL) -o $@
 	mkdir -p $(BINDIR)/$(lastword $(subst /, ,$@))
 	ln -sf $@ $(BINDIR)/$(lastword $(subst /, ,$@))
-	@echo "----> $(BINDIR)/ <----"
+	@echo "----> $(BINDIR)/$(lastword $(subst /, ,$@))/$(lastword $(subst /, ,$@)) <----"
 	@[ "$(R)" = noexec ] && echo '(not running it, use `make R="[<options>]" ...` for valgrind+gdb)' || $(dir $(MAKEFILE))/valgdb $@ $(R)
 
 FORCE:

From 9f00b634ddd53b786df3feb1a653d4ee5a9e6804 Mon Sep 17 00:00:00 2001
From: david gauchard <gauchard@laas.fr>
Date: Fri, 4 Dec 2020 02:24:31 +0100
Subject: [PATCH 2/2] fix including debug.cpp, fix ranlib log

---
 cores/esp8266/debug.cpp | 1 +
 tests/host/Makefile     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cores/esp8266/debug.cpp b/cores/esp8266/debug.cpp
index 0d0bde2dfe..afaf5553e8 100644
--- a/cores/esp8266/debug.cpp
+++ b/cores/esp8266/debug.cpp
@@ -20,6 +20,7 @@
 
 #include "Arduino.h"
 #include "debug.h"
+#include "osapi.h"
 
 void ICACHE_RAM_ATTR hexdump(const void *mem, uint32_t len, uint8_t cols) {
     const uint8_t* src = (const uint8_t*) mem;
diff --git a/tests/host/Makefile b/tests/host/Makefile
index 9f46db22f8..b7314a6d41 100644
--- a/tests/host/Makefile
+++ b/tests/host/Makefile
@@ -62,11 +62,13 @@ VERBC   = @echo "C   $@";
 VERBCXX = @echo "C++ $@";
 VERBLD  = @echo "LD  $@";
 VERBAR  = @echo "AR  $@";
+VERBRANLIB = @echo "RANLIB $@";
 else
 VERBC   =
 VERBCXX =
 VERBLD  =
 VERBAR  =
+VERBRANLIB =
 endif
 
 $(shell mkdir -p $(BINDIR))
@@ -383,7 +385,7 @@ FULLCORE_OBJECTS_ISOLATED = $(FULLCORE_OBJECTS:%.o=$(BINDIR)/%.o)
 
 $(BINDIR)/fullcore.a: $(FULLCORE_OBJECTS_ISOLATED)
 	$(VERBAR) $(AR) rc $@ $^
-	$(VERBAR) $(RANLIB) $@
+	$(VERBRANLIB) $(RANLIB) $@
 
 ifeq ($(INO),)