From 8bf01b0d3e64ed7796bef7f273b3dba2c8247d26 Mon Sep 17 00:00:00 2001 From: Albert Date: Wed, 12 Mar 2025 13:28:34 -0400 Subject: [PATCH] Removing Tests --- .github/workflows/linux.yml | 51 ----------- .github/workflows/linux_arm.yml | 35 ------- tests/GNUmakefile | 156 -------------------------------- tests/call_c_from_js.c | 113 ----------------------- tests/fail_test.c | 30 ------ 5 files changed, 385 deletions(-) delete mode 100644 tests/GNUmakefile delete mode 100644 tests/call_c_from_js.c delete mode 100644 tests/fail_test.c diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 103bf883..b8f67a40 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -92,27 +92,6 @@ jobs: make call_c_from_js.c make fail_test.c ls -1 - - name: Test Static - timeout-minutes: 2 - run: | - cd tests - call_c_from_js=$(pwd)/call_c_from_js - fail_test=$(pwd)/fail_test - xvfb-run "$call_c_from_js" - # Run again and capture its output. - output=$(xvfb-run --auto-servernum --server-num=1 "$call_c_from_js") - [[ "$output" == *"Hello from the backend!"* ]] && true || exit 1 - xvfb-run --auto-servernum --server-num=1 "$fail_test" && exit 1 || true - - name: Test Dynamic - timeout-minutes: 2 - run: | - cd tests - call_c_from_js=$(pwd)/call_c_from_js-dyn - fail_test=$(pwd)/fail_test-dyn - xvfb-run "$call_c_from_js" - output=$(xvfb-run --auto-servernum --server-num=1 "$call_c_from_js") - [[ "$output" == *"Hello from the backend!"* ]] && true || exit 1 - xvfb-run --auto-servernum --server-num=1 "$fail_test" && exit 1 || true - name: Prepare Artifact run: | cp -r include dist @@ -219,33 +198,3 @@ jobs: fi done exit $exit_code - # - name: Setup Browser - # uses: browser-actions/setup-chrome@v1 - # - name: Setup Tests - # run: | - # sudo apt update && sudo apt install xvfb - # cd tests - # make call_c_from_js.c - # make fail_test.c - # ls -1 - # - name: Test Static - # timeout-minutes: 2 - # run: | - # cd tests - # call_c_from_js=$(pwd)/call_c_from_js - # fail_test=$(pwd)/fail_test - # xvfb-run "$call_c_from_js" - # # Run again and capture its output. - # output=$(xvfb-run --auto-servernum --server-num=1 "$call_c_from_js") - # [[ "$output" == *"Hello from the backend!"* ]] && true || exit 1 - # xvfb-run --auto-servernum --server-num=1 "$fail_test" && exit 1 || true - # - name: Test Dynamic - # timeout-minutes: 2 - # run: | - # cd tests - # call_c_from_js=$(pwd)/call_c_from_js-dyn - # fail_test=$(pwd)/fail_test-dyn - # xvfb-run "$call_c_from_js" - # output=$(xvfb-run --auto-servernum --server-num=1 "$call_c_from_js") - # [[ "$output" == *"Hello from the backend!"* ]] && true || exit 1 - # xvfb-run --auto-servernum --server-num=1 "$fail_test" && exit 1 || true diff --git a/.github/workflows/linux_arm.yml b/.github/workflows/linux_arm.yml index 55e3a501..6bd23575 100644 --- a/.github/workflows/linux_arm.yml +++ b/.github/workflows/linux_arm.yml @@ -119,41 +119,6 @@ jobs: # fi # done # exit $exit_code - # - name: Setup Browser - # if: matrix.cc == 'arm64' - # uses: browser-actions/setup-chrome@v1 - # - name: Setup Tests - # if: matrix.cc == 'arm64' - # run: | - # sudo apt update - # sudo apt install -y xvfb - # cd tests - # make CC=aarch64-linux-gnu-gcc call_c_from_js.c - # make CC=aarch64-linux-gnu-gcc fail_test.c - # ls -1 - # - name: Test Static - # if: matrix.cc == 'arm64' - # timeout-minutes: 2 - # run: | - # cd tests - # call_c_from_js=$(pwd)/call_c_from_js - # fail_test=$(pwd)/fail_test - # xvfb-run "$call_c_from_js" - # # Run again and capture its output. - # output=$(xvfb-run --auto-servernum --server-num=1 "$call_c_from_js") - # [[ "$output" == *"Hello from the backend!"* ]] && true || exit 1 - # xvfb-run --auto-servernum --server-num=1 "$fail_test" && exit 1 || true - # - name: Test Dynamic - # if: matrix.cc == 'arm64' - # timeout-minutes: 2 - # run: | - # cd tests - # call_c_from_js=$(pwd)/call_c_from_js-dyn - # fail_test=$(pwd)/fail_test-dyn - # xvfb-run "$call_c_from_js" - # output=$(xvfb-run --auto-servernum --server-num=1 "$call_c_from_js") - # [[ "$output" == *"Hello from the backend!"* ]] && true || exit 1 - # xvfb-run --auto-servernum --server-num=1 "$fail_test" && exit 1 || true - name: Prepare Artifact run: | cp -r include dist diff --git a/tests/GNUmakefile b/tests/GNUmakefile deleted file mode 100644 index fdb02a83..00000000 --- a/tests/GNUmakefile +++ /dev/null @@ -1,156 +0,0 @@ -# WebUI C Tests - -# == 1. VARIABLES ============================================================= - -MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) -PROJECT_DIR := $(dir $(MAKEFILE_PATH))/../ - -TEST_SRC := $(firstword $(MAKECMDGOALS)) -TEST_OUT = $(patsubst %.c,%,$(TEST_SRC)) - -LIB_DIR := $(PROJECT_DIR)/dist -ifeq ($(WEBUI_DEBUG), 1) -LIB_DIR := $(LIB_DIR)/debug -endif - -INCLUDE_DIR := $(PROJECT_DIR)/include -WEBUI_LIB_NAME = webui-2 - -ifeq ($(WEBUI_USE_TLS), 1) -WEBUI_LIB_NAME = webui-2-secure -endif - -# Build the WebUI library if running via `make BUILD_LIB=true` -CC ?= gcc -BUILD_LIB ?= - -ifeq ($(CC), cc) - ifeq ($(shell uname),Darwin) - CC = clang - else - CC = gcc - endif -endif - -# BUILD FLAGS -STATIC_BUILD_FLAGS = $(TEST_SRC) -I"$(INCLUDE_DIR)" -L"$(LIB_DIR)" -DYN_BUILD_FLAGS = $(TEST_SRC) -I"$(INCLUDE_DIR)" -L"$(LIB_DIR)" - -# Platform conditions -ifeq ($(OS),Windows_NT) - # Windows - PLATFORM := windows - SHELL := CMD - STATIC_BUILD_FLAGS += -l$(WEBUI_LIB_NAME)-static -lws2_32 -Wall -luser32 -static - COPY_LIB_CMD := @copy "$(LIB_DIR)\$(WEBUI_LIB_NAME).dll" "$(WEBUI_LIB_NAME).dll" - DYN_BUILD_FLAGS += "$(WEBUI_LIB_NAME).dll" -lws2_32 -Wall -luser32 - STATIC_OUT := $(TEST_OUT).exe - DYN_OUT := $(TEST_OUT)-dyn.exe - LWS2_OPT := -lws2_32 -lole32 - STRIP_OPT := --strip-all - CONSOLE_APP := -Wl,-subsystem=console - GUI_APP := -Wl,-subsystem=windows -else - STATIC_BUILD_FLAGS += -lpthread -lm -l$(WEBUI_LIB_NAME)-static - DYN_BUILD_FLAGS += -lpthread -lm - STATIC_OUT := $(TEST_OUT) - DYN_OUT := $(TEST_OUT)-dyn - ifeq ($(shell uname),Darwin) - # MacOS - PLATFORM := macos - COPY_LIB_CMD := @cp "$(LIB_DIR)/lib$(WEBUI_LIB_NAME).dylib" "lib$(WEBUI_LIB_NAME).dylib" - DYN_BUILD_FLAGS += -l$(WEBUI_LIB_NAME) - WKWEBKIT_LINK_FLAGS := -framework Cocoa -framework WebKit - else - # Linux - PLATFORM := linux - COPY_LIB_CMD := @cp "$(LIB_DIR)/lib$(WEBUI_LIB_NAME).so" "lib$(WEBUI_LIB_NAME).so" - STATIC_BUILD_FLAGS += -ldl - DYN_BUILD_FLAGS += -ldl -l$(WEBUI_LIB_NAME) - STRIP_OPT := --strip-all - ifeq ($(CC),clang) - LLVM_OPT := llvm- - endif - endif -endif - -# == 2.TARGETS ================================================================ - -*.c: all - -.PHONY: all -all: release - -.PHONY: debug -debug: -ifeq ($(BUILD_LIB),true) - @cd "$(PROJECT_DIR)" && $(MAKE) debug -endif -# Static with Debug info -ifneq ($(WEBUI_USE_TLS), 1) - @echo "Building '$(TEST_SRC)' ($(CC) debug static)..." - @$(CC) -g $(CONSOLE_APP) $(STATIC_BUILD_FLAGS) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS) -o $(STATIC_OUT) -endif -# Dynamic with Debug info - @echo "Building '$(TEST_SRC)' ($(CC) debug dynamic)..." - $(COPY_LIB_CMD) - @$(CC) -g $(CONSOLE_APP) $(DYN_BUILD_FLAGS) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS) -o $(DYN_OUT) -# Clean -ifeq ($(PLATFORM),windows) - @- del *.o >nul 2>&1 -else - @- rm -f *.o - @- rm -rf *.dSYM # macOS -endif - @echo "Done." - -.PHONY: .release -release: -ifeq ($(BUILD_LIB),true) - @cd "$(PROJECT_DIR)" && $(MAKE) -endif -# Static Release -ifneq ($(WEBUI_USE_TLS), 1) - @echo "Building '$(TEST_SRC)' ($(CC) static)..." - @$(CC) -Os $(GUI_APP) $(STATIC_BUILD_FLAGS) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS) -o $(STATIC_OUT) - @$(LLVM_OPT)strip $(STRIP_OPT) $(STATIC_OUT) -endif -# Dynamic Release - @echo "Building '$(TEST_SRC)' ($(CC) dynamic)..." - $(COPY_LIB_CMD) - @$(CC) $(GUI_APP) $(DYN_BUILD_FLAGS) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS) -o $(DYN_OUT) - @$(LLVM_OPT)strip $(STRIP_OPT) $(DYN_OUT) -# Clean -ifeq ($(PLATFORM),windows) - @- del *.o >nul 2>&1 -else - @- rm -f *.o - @- rm -rf *.dSYM # macOS -endif - @echo "Done." - -clean: --clean-$(PLATFORM) - -# INTERNAL TARGETS - -.PHONY: --clean-linux ---clean-linux: --clean-unix - -.PHONY: --clean-macos ---clean-macos: clean-unix - -.PHONY: --clean-unix ---clean-unix: - - rm -f *.o - - rm -f *.a - - rm -f *.so - - rm -f *.dylib - - rm -rf *.dSYM - -.PHONY: --clean-windows ---clean-windows: - - del *.o >nul 2>&1 - - del *.dll >nul 2>&1 - - del *.a >nul 2>&1 - - del *.exe >nul 2>&1 - diff --git a/tests/call_c_from_js.c b/tests/call_c_from_js.c deleted file mode 100644 index 90a3dce3..00000000 --- a/tests/call_c_from_js.c +++ /dev/null @@ -1,113 +0,0 @@ -#include "webui.h" - -const char *doc = - "" - "" - " " - "" - "" - " " - "" - ""; - -void assert_int(webui_event_t *e) { - size_t count = webui_get_count(e); - assert(count == 3); - - long long num = webui_get_int(e); - long long num1 = webui_get_int_at(e, 0); - long long num2 = webui_get_int_at(e, 1); - long long num3 = webui_get_int_at(e, 2); - - assert(num == 1); - assert(num1 == num); - assert(num2 == 23); - assert(num3 == 345); -} - -void assert_float(webui_event_t *e) { - size_t count = webui_get_count(e); - assert(count == 3); - - double num = webui_get_float(e); - double num1 = webui_get_float_at(e, 0); - double num2 = webui_get_float_at(e, 1); - double num3 = webui_get_float_at(e, 2); - - printf("num1: %f, num2: %f, num3: %f\n", num1, num2, num3); - // TODO: enable asserts after get_float is fixed. - // assert(num == 1.0); - // assert(num1 == num); - // assert(num2 == 2.3); - // assert(num3 == 3.45); -} - -void assert_string(webui_event_t *e) { - size_t count = webui_get_count(e); - assert(count == 3); - - const char *str = webui_get_string(e); - const char *str1 = webui_get_string_at(e, 0); - const char *str2 = webui_get_string_at(e, 1); - const char *str3 = webui_get_string_at(e, 2); - - assert(strcmp(str, "foo") == 0); - assert(strcmp(str1, str) == 0); - assert(strcmp(str2, "bar") == 0); - assert(strcmp(str3, "baz") == 0); -} - -void assert_bool(webui_event_t *e) { - size_t count = webui_get_count(e); - assert(count == 3); - - long long b = webui_get_bool(e); - long long b1 = webui_get_bool_at(e, 0); - long long b2 = webui_get_bool_at(e, 1); - long long b3 = webui_get_bool_at(e, 2); - - assert(b == true); - assert(b1 == b); - assert(b2 == false); - assert(b3 == true); -} - -void assert_cprint(webui_event_t *e) { - size_t count = webui_get_count(e); - assert(count == 0); - - // The print should be confirmed by checking the program's terminal output. - printf("Hello from the backend!\n"); -} - -void assert_close(webui_event_t *e) { - // Closing often leads to a seqfault at the moment. Therefore, just a sysexit for now. - // webui_close(e->window); - exit(EXIT_SUCCESS); -} - -int main() { - size_t w = webui_new_window(); - - webui_bind(w, "assert_int", assert_int); - webui_bind(w, "assert_float", assert_float); - webui_bind(w, "assert_string", assert_string); - webui_bind(w, "assert_bool", assert_bool); - webui_bind(w, "assert_cprint", assert_cprint); - webui_bind(w, "assert_close", assert_close); - - webui_show(w, doc); - webui_wait(); - webui_clean(); - - return 0; -} diff --git a/tests/fail_test.c b/tests/fail_test.c deleted file mode 100644 index 279df9eb..00000000 --- a/tests/fail_test.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "webui.h" - -const char *doc = - "" - "" - " " - "" - "" - " " - "" - ""; - -void fail(webui_event_t *e) { - // This test should help to ensure that test failures can be detected from CI. - exit(EXIT_FAILURE); -} - -int main() { - size_t w = webui_new_window(); - - webui_bind(w, "fail", fail); - webui_show(w, doc); - webui_wait(); - - return 0; -}