From ca175dffc05aa1b00641647272aa7ab3d1201565 Mon Sep 17 00:00:00 2001 From: Christian C Date: Sat, 8 Mar 2025 00:57:18 -0800 Subject: Test minor restructure --- Makefile | 10 ++++++++-- src/test/test.c | 30 ------------------------------ test/test.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 32 deletions(-) delete mode 100644 src/test/test.c create mode 100644 test/test.c diff --git a/Makefile b/Makefile index 01e8fb4..5420b74 100644 --- a/Makefile +++ b/Makefile @@ -77,11 +77,15 @@ LDFLAGS+=$(shell $(PKGCONF) --libs $(PKGS)) default: clean build -.PHONY: clean build run +.PHONY: clean build test run build: $(PROGS) -$(BUILD_DIR)$(PROG_DIR)%: $(SRC_OBJ_DIR)%.o $(LIB_OBJS) $(TEST_OBJS) +$(BUILD_DIR)$(PROG_DIR)%: $(SRC_OBJ_DIR)%.o $(LIB_OBJS) + @echo LD --\> $@ + @gcc -o $@ $(LDFLAGS) $^ + +build/test: $(TEST_OBJS) $(LIB_OBJS) @echo LD --\> $@ @gcc -o $@ $(LDFLAGS) $^ @@ -97,6 +101,8 @@ $(TEST_OBJ_DIR)%.o: $(TEST_DIR)%.c @echo CC $< --\> $@ @gcc -o $@ $(CFLAGS) -c $< +test: build/test + clean: @echo Cleaning build files... @-rm -rf $(OBJ_DIR) $(BUILD_DIR) diff --git a/src/test/test.c b/src/test/test.c deleted file mode 100644 index 40e2d6f..0000000 --- a/src/test/test.c +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include -#include - -#define _META_TEST_RESULT(name,result) if (result) { fprintf(stderr, " \x1b[92mPASS\x1b[0m %s\n", name);} else { fprintf(stderr, "%s: \x1b[91mFAIL\x1b[0m\n", name);} - -int main() -{ - bool_t all_success = TRUE; - bool_t test_success; - // lib/color.c Test - test_success = TEST_lib_color(); - all_success &= test_success; - _META_TEST_RESULT("LIB/COLOR", test_success) - - // lib/dir.c Test - test_success = TEST_lib_dir(); - all_success &= test_success; - _META_TEST_RESULT("LIB/DIR", test_success) - - // lib/time.c Test - test_success = TEST_lib_time(); - all_success &= test_success; - _META_TEST_RESULT("LIB/TIME", test_success) - - if (all_success == TRUE) { - return 0; - } - return 1; -} diff --git a/test/test.c b/test/test.c new file mode 100644 index 0000000..40e2d6f --- /dev/null +++ b/test/test.c @@ -0,0 +1,30 @@ +#include +#include +#include + +#define _META_TEST_RESULT(name,result) if (result) { fprintf(stderr, " \x1b[92mPASS\x1b[0m %s\n", name);} else { fprintf(stderr, "%s: \x1b[91mFAIL\x1b[0m\n", name);} + +int main() +{ + bool_t all_success = TRUE; + bool_t test_success; + // lib/color.c Test + test_success = TEST_lib_color(); + all_success &= test_success; + _META_TEST_RESULT("LIB/COLOR", test_success) + + // lib/dir.c Test + test_success = TEST_lib_dir(); + all_success &= test_success; + _META_TEST_RESULT("LIB/DIR", test_success) + + // lib/time.c Test + test_success = TEST_lib_time(); + all_success &= test_success; + _META_TEST_RESULT("LIB/TIME", test_success) + + if (all_success == TRUE) { + return 0; + } + return 1; +} -- cgit v1.2.1