Skip to content

emulation on host: various minor fixes #7741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d-a-v merged 2 commits into from
Dec 4, 2020
Merged

emulation on host: various minor fixes #7741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
463b17f
emulation on host: makefile minor fixes
d-a-v Dec 4, 2020
9f00b63
fix including debug.cpp, fix ranlib log
d-a-v Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cores/esp8266/debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 9 additions & 3 deletions tests/host/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,20 @@ 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))

CORE_CPP_FILES := \
$(addprefix $(abspath $(CORE_PATH))/,\
debug.cpp \
StreamString.cpp \
Stream.cpp \
WString.cpp \
Expand Down Expand Up @@ -226,7 +229,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
Expand Down Expand Up @@ -379,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),)

Expand All @@ -392,7 +398,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:
Expand Down