device tests: mock scripts + rename some tests to enable mock-testing…

… them
esp8266 · d-a-v · Dec 16, 2019 · Dec 15, 2019 · Dec 15, 2019 · Dec 16, 2019
commit 9ce083b3cf08e52f654db5c8afe901146b4a8aa7
diff --git a/tests/device/Makefile b/tests/device/Makefile
@@ -1,6 +1,5 @@
 SHELL := /bin/bash
 V ?= 0
-TEST_LIST ?= $(wildcard test_*/*.ino)
 ESP8266_CORE_PATH ?= $(realpath ../..)
 BUILD_DIR ?= $(PWD)/.build
 HARDWARE_DIR ?= $(PWD)/.hardware
@@ -18,6 +17,11 @@ TEST_CONFIG := test_env.cfg
 TEST_REPORT_XML := test_report.xml
 TEST_REPORT_HTML := test_report.html
 
+ifeq ("$(MOCK)", "1")
+TEST_LIST ?= $(wildcard test_sw_*/*.ino)
+else
+TEST_LIST ?= $(wildcard test_*/*.ino)
+endif
 
 ifneq ("$(V)","1")
 	SILENT = @
@@ -53,6 +57,18 @@ $(TEST_LIST):
 	@echo "--------------------------------"
 	@echo "Running test '$@' of $(words $(TEST_LIST)) tests"
 	$(SILENT)mkdir -p $(LOCAL_BUILD_DIR)
+ifeq ("$(MOCK)", "1")
+	@echo Compiling $(notdir $@)
+	(cd ../host; make ULIBDIRS=../device/libraries/BSTest ../device/$(@:%.ino=%))
+	$(SILENT)source $(BS_DIR)/virtualenv/bin/activate && \
+		$(PYTHON) $(BS_DIR)/runner.py \
+			$(RUNNER_DEBUG_FLAG) \
+			-e "$(ESP8266_CORE_PATH)/tests/host/bin/$(@:%.ino=%)" \
+			-n $(basename $(notdir $@)) \
+			-o $(LOCAL_BUILD_DIR)/test_result.xml \
+			--env-file $(TEST_CONFIG) \
+			`test -f $(addsuffix .py, $(basename $@)) && echo "-m $(addsuffix .py, $(basename $@))" || echo ""`
+else
 ifneq ("$(NO_BUILD)","1")
 	@test -n "$(ARDUINO_IDE_PATH)" || (echo "Please export ARDUINO_IDE_PATH" && exit 1)
 	@echo Compiling $(notdir $@)
@@ -108,6 +124,7 @@ ifneq ("$(NO_RUN)","1")
 			--env-file $(TEST_CONFIG) \
 			`test -f $(addsuffix .py, $(basename $@)) && echo "-m $(addsuffix .py, $(basename $@))" || echo ""`
 endif
+endif
 
 $(TEST_REPORT_XML): $(HARDWARE_DIR) virtualenv
 	$(SILENT)$(BS_DIR)/xunitmerge $(shell find $(BUILD_DIR) -name 'test_result.xml' | xargs echo) $(TEST_REPORT_XML)

diff --git a/tests/device/test_FS/test_FS.ino → tests/device/test_sw_FS/test_sw_FS.ino b/tests/device/test_FS/test_FS.ino → tests/device/test_sw_FS/test_sw_FS.ino
diff --git a/...e/test_Print_printf/test_Print_printf.ino → ..._sw_Print_printf/test_sw_Print_printf.ino b/...e/test_Print_printf/test_Print_printf.ino → ..._sw_Print_printf/test_sw_Print_printf.ino
diff --git a/...evice/test_WiFiServer/test_WiFiServer.ino → ...test_sw_WiFiServer/test_sw_WiFiServer.ino b/...evice/test_WiFiServer/test_WiFiServer.ino → ...test_sw_WiFiServer/test_sw_WiFiServer.ino
diff --git a/...device/test_WiFiServer/test_WiFiServer.py → .../test_sw_WiFiServer/test_sw_WiFiServer.py b/...device/test_WiFiServer/test_WiFiServer.py → .../test_sw_WiFiServer/test_sw_WiFiServer.py
diff --git a/tests/device/test_http_client/server.crt → tests/device/test_sw_http_client/server.crt b/tests/device/test_http_client/server.crt → tests/device/test_sw_http_client/server.crt
diff --git a/tests/device/test_http_client/server.csr → tests/device/test_sw_http_client/server.csr b/tests/device/test_http_client/server.csr → tests/device/test_sw_http_client/server.csr
diff --git a/tests/device/test_http_client/server.key → tests/device/test_sw_http_client/server.key b/tests/device/test_http_client/server.key → tests/device/test_sw_http_client/server.key
diff --git a/...ice/test_http_client/test_http_client.ino → ...st_sw_http_client/test_sw_http_client.ino b/...ice/test_http_client/test_http_client.ino → ...st_sw_http_client/test_sw_http_client.ino
@@ -210,6 +210,7 @@ TEST_CASE("HTTPS GET request", "[HTTPClient]")
     //
     // Same tests with axTLS
     //
+#if !CORE_MOCK
     {
         // small request
 #pragma GCC diagnostic push
@@ -242,6 +243,7 @@ TEST_CASE("HTTPS GET request", "[HTTPClient]")
             }
         }
     }
+#endif
 }
 
 void loop()

diff --git a/...vice/test_http_client/test_http_client.py → ...est_sw_http_client/test_sw_http_client.py b/...vice/test_http_client/test_http_client.py → ...est_sw_http_client/test_sw_http_client.py
diff --git a/tests/device/test_newlib/test_newlib.ino → .../device/test_sw_newlib/test_sw_newlib.ino b/tests/device/test_newlib/test_newlib.ino → .../device/test_sw_newlib/test_sw_newlib.ino
diff --git a/tests/device/test_schedule/test_schedule.ino → ...ice/test_sw_schedule/test_sw_schedule.ino b/tests/device/test_schedule/test_schedule.ino → ...ice/test_sw_schedule/test_sw_schedule.ino
diff --git a/tests/device/test_tests/test_tests.ino → tests/device/test_sw_tests/test_sw_ 10000 tests.ino b/tests/device/test_tests/test_tests.ino → tests/device/test_sw_tests/test_sw_ 10000 tests.ino
diff --git a/tests/host/common/ArduinoMain.cpp b/tests/host/common/ArduinoMain.cpp
@@ -49,6 +49,7 @@ bool ignore_sigint = false;
 bool restore_tty = false;
 bool mockdebug = false;
 int mock_port_shifter = MOCK_PORT_SHIFTER;
+bool blocking_uart = false;
 
 #define STDIN STDIN_FILENO
 
@@ -174,7 +175,7 @@ void control_c (int sig)
 int main (int argc, char* const argv [])
 {
 	bool fast = false;
-	bool blocking_uart = false;
+	blocking_uart = false; // global
 
 	signal(SIGINT, control_c);
 	if (geteuid() == 0)

diff --git a/tests/host/common/MockUART.cpp b/tests/host/common/MockUART.cpp
@@ -190,6 +190,13 @@ uart_read(uart_t* uart, char* userbuffer, size_t usersize)
 	if(uart == NULL || !uart->rx_enabled)
 		return 0;
 
+    if (!blocking_uart)
+    {
+        char c;
+        if (read(0, &c, 1) == 1)
+            uart_new_data(0, c);
+    }
+
 	size_t ret = 0;
 	while (ret < usersize && uart_rx_available_unsafe(uart->rx_buffer))
 	{

diff --git a/tests/host/common/mock.h b/tests/host/common/mock.h
@@ -104,12 +104,14 @@ extern "C" {
 #endif
 int ets_printf (const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
 #define os_printf_plus printf
+#define ets_vsnprintf vsnprintf
 
 int mockverbose (const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
 
 extern const char* host_interface; // cmdline parameter
 extern bool serial_timestamp;
 extern int mock_port_shifter;
+extern bool blocking_uart;
 
 #define NO_GLOBAL_BINDING 0xffffffff
 extern uint32_t global_ipv4_netfmt; // selected interface addresse to bind to