diff --git a/.travis.yml b/.travis.yml index b703907ba..3d09dd68c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ script: - export CXX="g++-4.8" CC="gcc-4.8" - pushd $TRAVIS_BUILD_DIR/tests/host - make + - bash <(curl -s https://codecov.io/bash) - popd - wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz - tar xf arduino.tar.xz diff --git a/tests/host/Makefile b/tests/host/Makefile index 2d6a1a723..bf236040b 100644 --- a/tests/host/Makefile +++ b/tests/host/Makefile @@ -3,6 +3,9 @@ BINARY_DIRECTORY := bin OUTPUT_BINARY := $(BINARY_DIRECTORY)/host_tests CORE_PATH := ../../cores/esp8266 +CC := gcc +CXX := g++ + CORE_CPP_FILES := $(addprefix $(CORE_PATH)/,\ StreamString.cpp \ Stream.cpp \ @@ -35,8 +38,9 @@ INC_PATHS += $(addprefix -I, \ TEST_CPP_FILES := \ fs/test_fs.cpp \ -CXXFLAGS += -std=c++11 -Wall -CFLAGS += -std=c99 -Wall +CXXFLAGS += -std=c++11 -Wall -coverage -O0 +CFLAGS += -std=c99 -Wall -coverage -O0 +LDFLAGS += -coverage -O0 remduplicates = $(strip $(if $1,$(firstword $1) $(call remduplicates,$(filter-out $(firstword $1),$1)))) @@ -50,7 +54,6 @@ CPP_SOURCE_FILE_NAMES = $(notdir $(CPP_SOURCE_FILES)) CPP_PATHS = $(call remduplicates, $(dir $(CPP_SOURCE_FILES) )) CPP_OBJECTS = $(addprefix $(OBJECT_DIRECTORY)/, $(CPP_SOURCE_FILE_NAMES:.cpp=.cpp.o) ) -$(warning $(call remduplicates, $(dir $(CPP_SOURCE_FILES) ))) vpath %.c $(C_PATHS) vpath %.cpp $(CPP_PATHS) @@ -61,7 +64,15 @@ all: $(OUTPUT_BINARY) test test: $(OUTPUT_BINARY) $(OUTPUT_BINARY) +clean: + rm -rf $(OBJECT_DIRECTORY) + rm -rf $(BINARY_DIRECTORY) + $(OBJECT_DIRECTORY): + which gcc + echo $(CC) + echo $(CXX) + $(CC) -v mkdir -p $@ $(BINARY_DIRECTORY): @@ -73,7 +84,5 @@ $(C_OBJECTS): $(OBJECT_DIRECTORY)/%.c.o: %.c $(CPP_OBJECTS): $(OBJECT_DIRECTORY)/%.cpp.o: %.cpp $(CXX) $(CXXFLAGS) $(INC_PATHS) -c -o $@ $< - -# Link $(OUTPUT_BINARY): $(BINARY_DIRECTORY) $(OBJECT_DIRECTORY) $(OBJECTS) $(CXX) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(OUTPUT_BINARY)