From eff7f52c368df5dc662d54956de5aa3b2b9ee936 Mon Sep 17 00:00:00 2001
From: Kimplul <kimi.h.kuparinen@gmail.com>
Date: Mon, 26 Aug 2024 18:34:24 +0300
Subject: simplify tests

---
 tests/scripts/gen-prog   |  4 +---
 tests/scripts/gen-simple | 10 +++++++---
 tests/scripts/makefile   |  5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'tests/scripts')

diff --git a/tests/scripts/gen-prog b/tests/scripts/gen-prog
index e56ecc3..6e99f37 100755
--- a/tests/scripts/gen-prog
+++ b/tests/scripts/gen-prog
@@ -23,12 +23,10 @@ do
 	echo "${NAME}_OBJS += ${obj}"				>> tests.mk
 	echo "${dep}:"						>> tests.mk
 	echo "-include ${dep}"					>> tests.mk
-	echo "${obj}: $NAME/${s}"				>> tests.mk
+	echo "${obj}: $NAME/${s} \$(COMMON)"			>> tests.mk
 	echo "	\$(COMPILE_TEST) -c $NAME/${s} -o ${obj}"	>> tests.mk
 done
 
 echo "build/${NAME}/$PROG: \$(${NAME}_OBJS) \$(COMMON)"	>> tests.mk
 echo "	\$(COMPILE_TEST) \$(${NAME}_OBJS) \$(COMMON) \
 		-o build/${NAME}/$PROG"	>> tests.mk
-
-echo "include ${NAME}/check.mk" >> tests.mk
diff --git a/tests/scripts/gen-simple b/tests/scripts/gen-simple
index ddec9a4..418cc02 100755
--- a/tests/scripts/gen-simple
+++ b/tests/scripts/gen-simple
@@ -26,6 +26,10 @@ echo "	rm -f reports/$NAME/*"						>> tests.mk
 echo "	timeout --foreground 30s \$(QEMU) \
 	build/$NAME/initrd > reports/$NAME/log" >> tests.mk
 
-echo "TESTS += $NAME"			>> tests.mk
-echo ".PHONY: do-$NAME"			>> tests.mk
-echo "do-$NAME: reports/$NAME/log"	>> tests.mk
+echo "TESTS += $NAME"								>> tests.mk
+echo ".PHONY: $NAME"								>> tests.mk
+echo "$NAME: reports/$NAME/log"							>> tests.mk
+echo "	grep 'BUG' reports/$NAME/log \\"					>> tests.mk
+echo "		&& echo 'BUG' > reports/$NAME/log \\"				>> tests.mk
+echo "		|| tail -n1 reports/$NAME/log | tr -d '\\\\r' \\"		>> tests.mk
+echo "		> reports/$NAME/OK"						>> tests.mk
diff --git a/tests/scripts/makefile b/tests/scripts/makefile
index 530e0bb..7b861e2 100644
--- a/tests/scripts/makefile
+++ b/tests/scripts/makefile
@@ -12,7 +12,8 @@ COMPILER	!= [ "$(LLVM)" != "0" ] \
 OBFLAGS		:= -ffreestanding -nostdlib -std=c17 -g
 INCLUDEFLAGS	:= -I ../include -I.
 WARNFLAGS	:= -Wall -Wextra
-COMPILE_TEST	:= $(COMPILER) $(WARNFLAGS) $(INCLUDEFLAGS) $(OBFLAGS)
+DEPFLAGS	= -MT $@ -MMD -MP -MF $@.d
+COMPILE_TEST	= $(COMPILER) $(WARNFLAGS) $(INCLUDEFLAGS) $(DEPFLAGS) $(OBFLAGS)
 
 GEN_INITRD	:= cpio -H newc -o >
 QEMU		:= qemu-system-$(ARCH) -machine virt -kernel ../kmi.bin \
@@ -26,7 +27,7 @@ QEMU		:= qemu-system-$(ARCH) -machine virt -kernel ../kmi.bin \
 KMI		:= ../kmi.bin
 COMMON		:= build/printf.o
 
-build/printf.o: common/printf.c
+build/printf.o: common/printf.c $(KMI)
 	$(COMPILE_TEST) -c common/printf.c -o build/printf.o
 
 include tests.mk
-- 
cgit v1.3