fix using spiffs/mock

Author: d-a-v

cores/esp8266/spiffs_api.cpp

@@ -109,6 +109,7 @@ bool isSpiffsFilenameValid(const char* name)
 }
 
 // these symbols should be defined in the linker script for each flash layout
+#ifndef CORE_MOCK
 #ifdef ARDUINO
 extern "C" uint32_t _SPIFFS_start;
 extern "C" uint32_t _SPIFFS_end;
@@ -131,6 +132,7 @@ FS SPIFFS = FS(FSImplPtr(new SPIFFSImpl(
                              SPIFFS_PHYS_PAGE,
                              SPIFFS_PHYS_BLOCK,
                              SPIFFS_MAX_OPEN_FILES)));
-#endif
+#endif // ARDUINO
+#endif // !CORE_MOCK
 
 #endif

tests/common.sh

@@ -134,7 +134,7 @@ function build_docs()
 function run_host_tests()
 {
     pushd host
-    make CI
+    make ARCH32=0 CI
     make clean-objects
     popd
 }

tests/host/Makefile

@@ -38,10 +38,10 @@ CORE_CPP_FILES := $(addprefix $(CORE_PATH)/,\
 	WString.cpp \
 	Print.cpp \
 	FS.cpp \
+	spiffs_api.cpp \
 	pgmspace.cpp \
 	MD5Builder.cpp \
 )
-#	spiffs_api.cpp \
 
 CORE_C_FILES := $(addprefix $(CORE_PATH)/,\
 	core_esp8266_noniso.c \
@@ -58,6 +58,7 @@ MOCK_CPP_FILES_COMMON := $(addprefix common/,\
 	spiffs_mock.cpp \
 	WMath.cpp \
 	HardwareSerial.cpp \
+	MockTools.cpp \
 )
 
 MOCK_CPP_FILES := $(MOCK_CPP_FILES_COMMON) $(addprefix common/,\
@@ -77,12 +78,12 @@ MOCK_C_FILES := $(addprefix common/,\
 INC_PATHS := $(addprefix -I,\
 	common \
 	$(CORE_PATH) \
-	$(shell echo ../../libraries/*/src) \
-	$(shell echo ../../libraries/*) \
-	../../tools/sdk/include \
 )
 
 INC_PATHS += $(addprefix -I,\
+	$(shell echo ../../libraries/*/src) \
+	$(shell echo ../../libraries/*) \
+	../../tools/sdk/include \
 	../../tools/sdk/lwip2/include \
 )
 
@@ -133,7 +134,7 @@ clean: clean-objects clean-coverage	# clean everything
 	rm -rf $(BINDIR)
 
 clean-objects:
-	rm -rf $(C_OBJECTS) $(CPP_OBJECTS_CORE) $(CPP_OBJECTS_CORE_EMU)
+	rm -rf $(C_OBJECTS) $(CPP_OBJECTS_CORE) $(CPP_OBJECTS_CORE_EMU) $(CPP_OBJECTS_TESTS)
 
 clean-coverage:
 	rm -rf $(COVERAGE_FILES) $(LCOV_DIRECTORY) *.gcov
@@ -217,7 +218,6 @@ MOCK_ARDUINO_LIBS := \
 	common/MockWiFiServer.cpp \
 	common/MockUDPSocket.cpp \
 	common/ArduinoWire.cpp \
-	common/MockTools.cpp \
 	common/MockEsp.cpp \
 	common/MockEEPROM.cpp \
 	common/MockSPI.cpp \

tests/host/common/ArduinoMain.cpp

@@ -46,6 +46,12 @@
 
 #include <map>
 
+#if 0
+#include "../common/spiffs_mock.h"
+#include <spiffs/spiffs.h>
+SPIFFS_MOCK_DECLARE(/*size_kb*/1024, /(blovk_kb*/8, /*page_b*/512);
+#endif
+
 std::map<int,UdpContext*> udps;
 
 void register_udp (int sock, UdpContext* udp)

tests/host/common/WMath.cpp

@@ -25,6 +25,7 @@
 
 extern "C" {
 #include <stdlib.h>
+#include <stdint.h>
 }
 
 void randomSeed(unsigned long seed) {