KolibriOS/umka
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update workflow

Browse Source 
- Add test target to main makefile
- Update .gitignore
- Simplify test/makefile
This commit is contained in:
mkostoevr 2021-12-12 13:48:42 +03:00 committed by Ivan Baravy
parent 08648324cb
commit bc5091705b
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,6 +11,7 @@ umka_gen_devices_dat
mkdirrange mkdirrange
mkfilepattern mkfilepattern
lfbviewx lfbviewx
randdir
*.img *.img
*.img.xz *.img.xz
*.img.gz *.img.gz

4
makefile
View File

@ -1,3 +1,4 @@
KOLIBRIOS=/root/Sources/kolibrios
FASM=fasm -dUEFI=1 -dextended_primary_loader=1 -dUMKA=1 FASM=fasm -dUEFI=1 -dextended_primary_loader=1 -dUMKA=1
CC=gcc CC=gcc
WARNINGS=-Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op \ 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 .PHONY: test
test: umka_shell
@cd test && make clean all && cd ../
covpreproc: covpreproc.c covpreproc: covpreproc.c
$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@

6
test/makefile
View File

@ -49,14 +49,14 @@ acpi: $(acpi_tests)
%.out.log: %.t %.out.log: %.t
$(UMKA_SHELL) < $*.t > $@ $(UMKA_SHELL) < $*.t > $@
@ cmp $*.{out,ref}.log @ cmp $*.out.log $*.ref.log
@ if [ -f "$*.ref.png" ]; then cmp $*.{out,ref}.png; fi @ if [ -f "$*.ref.png" ]; then cmp $*.out.png $*.ref.png; fi
collect_coverage: collect_coverage:
../covpreproc ../umka.lst 0x34 coverage.* > ../umka.cov ../covpreproc ../umka.lst 0x34 coverage.* > ../umka.cov
clean: clean:
rm -f ???_*.out.{log,png} coverage.* rm -f *.out.log *.out.png coverage.*
update_logs: update_logs:
for f in *ref.log; do cp $$(basename $$f .ref.log).out.log $$f; done for f in *ref.log; do cp $$(basename $$f .ref.log).out.log $$f; done