From bc5091705b282c9d532cc5c58457fc3a712ad27b Mon Sep 17 00:00:00 2001
From: mkostoevr <mkostoevr@yandex.ru>
Date: Sun, 12 Dec 2021 13:48:42 +0300
Subject: [PATCH] Update workflow

- Add test target to main makefile
- Update .gitignore
- Simplify test/makefile
---
 .gitignore    | 1 +
 makefile      | 4 ++++
 test/makefile | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ff3359..36b3f73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ umka_gen_devices_dat
 mkdirrange
 mkfilepattern
 lfbviewx
+randdir
 *.img
 *.img.xz
 *.img.gz
diff --git a/makefile b/makefile
index fe56215..6cddd89 100644
--- a/makefile
+++ b/makefile
@@ -1,3 +1,4 @@
+KOLIBRIOS=/root/Sources/kolibrios
 FASM=fasm -dUEFI=1 -dextended_primary_loader=1 -dUMKA=1
 CC=gcc
 WARNINGS=-Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op \
@@ -16,6 +17,9 @@ all: umka_shell umka_fuse umka_os umka_gen_devices_dat umka.sym umka.prp \
 
 .PHONY: test
 
+test: umka_shell
+	@cd test && make clean all && cd ../
+
 covpreproc: covpreproc.c
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
diff --git a/test/makefile b/test/makefile
index 994e5c4..c0acc90 100644
--- a/test/makefile
+++ b/test/makefile
@@ -49,14 +49,14 @@ acpi: $(acpi_tests)
 
 %.out.log: %.t
 	$(UMKA_SHELL) < $*.t > $@
-	@ cmp $*.{out,ref}.log
-	@ if [ -f "$*.ref.png" ]; then cmp $*.{out,ref}.png; fi
+	@ cmp $*.out.log $*.ref.log
+	@ if [ -f "$*.ref.png" ]; then cmp $*.out.png $*.ref.png; fi
 
 collect_coverage:
 	../covpreproc ../umka.lst 0x34 coverage.* > ../umka.cov
 
 clean:
-	rm -f ???_*.out.{log,png} coverage.*
+	rm -f *.out.log *.out.png coverage.*
 
 update_logs:
 	for f in *ref.log; do cp $$(basename $$f .ref.log).out.log $$f; done