fix tests

Author: scaprile

.github/workflows/nightly.yml

@@ -357,7 +357,7 @@ jobs:
       matrix:
         ssl: ["", -DMG_TLS=MG_TLS_BUILTIN]
         example:
-          - path: tutorials/http/device-dashboard/microchip/same54-xpro
+          - path: http/device-dashboard/microchip/same54-xpro
           - path: nxp/rt1020-evk-make-freertos-builtin
           - path: nxp/rt1060-evk-make-freertos-builtin
           - path: nxp/rt1170-evk-make-freertos-builtin

mongoose.c

@@ -9763,6 +9763,9 @@ void mg_timer_poll(struct mg_timer **head, uint64_t now_ms) {
  *
  *******************************************************************************/
 
+
+
+#if MG_TLS == MG_TLS_BUILTIN
 /******************************************************************************/
 #define AES_DECRYPTION 1  // whether AES decryption is supported
 /******************************************************************************/
@@ -9772,9 +9775,6 @@ void mg_timer_poll(struct mg_timer **head, uint64_t now_ms) {
 
 
 
-
-
-#if MG_TLS == MG_TLS_BUILTIN
 /******************************************************************************
  *  AES_INIT_KEYGEN_TABLES : MUST be called once before any AES use
  ******************************************************************************/

src/tls_aes128.c

@@ -20,18 +20,18 @@
  *
  *******************************************************************************/
 
+#include "arch.h"
+#include "tls.h"
+#if MG_TLS == MG_TLS_BUILTIN
 /******************************************************************************/
 #define AES_DECRYPTION 1  // whether AES decryption is supported
 /******************************************************************************/
 
 #define MG_ENCRYPT 1  // specify whether we're encrypting
 #define MG_DECRYPT 0  // or decrypting
 
-#include "arch.h"
-#include "tls.h"
 #include "tls_aes128.h"
 
-#if MG_TLS == MG_TLS_BUILTIN
 /******************************************************************************
  *  AES_INIT_KEYGEN_TABLES : MUST be called once before any AES use
  ******************************************************************************/

test/Makefile

@@ -10,6 +10,7 @@ ROOT_DIR = $(realpath $(CWD)/..)
 ENV ?=  -e Tmp=. -e WINEDEBUG=-all
 DOCKER_BIN ?= docker
 DOCKER ?= $(DOCKER_BIN) run --platform linux/amd64 --rm $(ENV) -v $(ROOT_DIR):$(ROOT_DIR) -w $(CWD)
+IS_DOCKER = 0
 VCFLAGS = /nologo /W3 /O2 /MD /I. $(DEFS) $(TFLAGS)
 IPV6 ?= 1
 ASAN ?= -fsanitize=address,undefined,alignment -fno-sanitize-recover=all -fno-omit-frame-pointer -fno-common
@@ -132,7 +133,15 @@ test: Makefile mongoose.h $(SRCS) tls_multirec/server
 	ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./unit_test
 
 tls_multirec/server: FORCE
+ifneq "$(SSL)" ""
+ifeq "$(IS_DOCKER)" "0"
 	$(MAKE) -C tls_multirec CC=gcc
+else
+	$(MAKE) -C tls_multirec CC="$(CC)" MINUSC=tls_multirec/
+endif
+else
+	true
+endif
 
 FORCE:
 	true
@@ -164,6 +173,8 @@ armhf: test
 
 s390: ASAN=
 s390: IPV6=0
+s390: IS_DOCKER=1
+s390: CFLAGS += -Wno-stringop-overflow
 s390: CC = $(DOCKER) mdashnet/s390 cc
 s390: RUN = $(DOCKER) mdashnet/s390
 s390: test

test/tls_multirec/Makefile

@@ -1,9 +1,11 @@
-CFLAGS = -W -Wall -Wextra -g -I.  # Build options
+# When running inside a container, we lose the -C information because $(CC) sets the path inside the container,
+# so, call with MINUSC=<path>/
+CFLAGS = -g -I.  # This is a known version, no need to check
 CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1 -DMG_ENABLE_IPV6=1
 CFLAGS_EXTRA ?= -DMG_TLS=MG_TLS_BUILTIN
 
 server: main.c patched_mongoose.c mongoose.h Makefile
-	$(CC) main.c patched_mongoose.c $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) -o $@
+	$(CC) $(MINUSC)main.c $(MINUSC)patched_mongoose.c $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) -o $(MINUSC)$@
 
 clean:
 	rm -f server

test/tls_multirec/main.c

@@ -63,7 +63,7 @@ static void cb(struct mg_connection *c, int ev, void *ev_data) {
     mg_tls_init(c, &opts);
   }
   if (ev == MG_EV_HTTP_MSG) {
-    struct mg_http_message *hm = ev_data;
+    struct mg_http_message *hm = (struct mg_http_message *) ev_data;
 
     if (mg_match(hm->uri, mg_str("/upload"), NULL)) {
       // Serve file upload

tutorials/tcp/modbus-dashboard/Makefile

@@ -1,21 +1,18 @@
 PROG ?= ./example       # Program we are building
-PACK ?= ./pack          # Packing executable
 DELETE = rm -rf         # Command to remove files
-GZIP ?= gzip            # For compressing files in web_root/
 OUT ?= -o $(PROG)       # Compiler argument for output file
 SOURCES = main.c mongoose.c net.c packed_fs.c   # Source code files
 CFLAGS = -W -Wall -Wextra -g -I.                # Build options
+NPX ?= npx
 
 # Mongoose build options. See https://mongoose.ws/documentation/#build-options
 CFLAGS_MONGOOSE += -DMG_ENABLE_PACKED_FS=1
 
 ifeq ($(OS),Windows_NT)         # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
   PROG = example.exe            # Use .exe suffix for the binary
-  PACK = pack.exe               # Packing executable
   CC = gcc                      # Use MinGW gcc compiler
   CFLAGS += -lws2_32            # Link against Winsock library
   DELETE = cmd /C del /Q /F /S  # Command prompt command to delete files
-  GZIP = echo                   # No gzip on Windows
 endif
 
 # Default target. Build and run program
@@ -32,14 +29,11 @@ web_root/bundle.js:
 
 # Create optimised CSS. Prerequisite: npm -g i tailwindcss tailwindcss-font-inter
 web_root/main.css: web_root/index.html $(wildcard web_root/*.js)
-	npx tailwindcss -o $@ --minify
+	$(NPX) tailwindcss -o $@ --minify
 
 # Generate packed filesystem for serving Web UI
 packed_fs.c: $(wildcard web_root/*) $(wildcard certs/*) Makefile web_root/main.css web_root/bundle.js
-	$(GZIP) web_root/*
-	$(CC) ../../../test/pack.c -o $(PACK)
-	$(PACK) web_root/* certs/* > $@
-	$(GZIP) -d web_root/*
+	node pack.js $(addsuffix ::gzip, $(wildcard web_root/*)) certs/* > $@
 
 mbedtls:
 	git clone --depth 1 -b v2.28.2 https://github.com/mbed-tls/mbedtls $@

tutorials/tcp/modbus-dashboard/pack.js

@@ -0,0 +1 @@
+../../http/device-dashboard/pack.js