From ece84932d1cc6101995e5b8ff848d70232c7f0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Wed, 10 May 2023 17:14:55 +0200 Subject: [PATCH] Add to global tests, fixup dependencies. --- src/Makefile | 8 +++++--- src/cal-day.scm | 14 ++++++++++++-- src/tests.scm | 2 ++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index d116e07..23cac43 100644 --- a/src/Makefile +++ b/src/Makefile @@ -50,7 +50,7 @@ HACKERBASE-OBJS=hackerbase.o testing.o listing.o cal-month.o \ util-string.o util-io.o util-list.o util-parser.o texts.o \ tests.o util-proc.o util-mail.o notifications.o \ util-format.o brmember-format.o logging.o specification.o \ - util-git.o + util-git.o cal-day.o .PHONY: imports imports: $(HACKERBASE-DEPS) @@ -300,7 +300,8 @@ TESTS-SOURCES=tests.scm listing.import.scm util-dict-list.import.scm \ util-list.import.scm ansi.import.scm command-line.import.scm \ mbase-dir.import.scm primes.import.scm brmember.import.scm \ table.import.scm util-csv.import.scm util-set-list.import.scm \ - util-parser.import.scm util-string.import.scm + util-parser.import.scm util-string.import.scm \ + cal-day.import.scm tests.o: tests.import.scm tests.import.scm: $(TESTS-SOURCES) @@ -366,7 +367,8 @@ CAL-PERIOD-SOURCES=cal-period.scm cal-month.import.scm \ cal-period.o: cal-period.import.scm cal-period.import.scm: $(CAL-PERIOD-SOURCES) -CAL-DAY-SOURCES=cal-day.scm util-tag.import.scm cal-month.import.scm +CAL-DAY-SOURCES=cal-day.scm util-tag.import.scm cal-month.import.scm \ + testing.import.scm cal-day.o: cal-day.import.scm cal-day.import.scm: $(CAL-DAY-SOURCES) diff --git a/src/cal-day.scm b/src/cal-day.scm index bafde01..c796114 100644 --- a/src/cal-day.scm +++ b/src/cal-day.scm @@ -37,12 +37,16 @@ cal-day-month cal-day-day - cal-day->cal-month + cal-day->month + + cal-day-tests! ) (import scheme + (chicken base) util-tag - cal-month) + cal-month + testing) ;; Type tag (define TAG-CAL-DAY (make-tag CAL-DAY)) @@ -110,5 +114,11 @@ (cal-month-add M 1) M))) + ;; Module self-tests + (define (cal-day-tests!) + (run-tests + cal-day + )) + ) diff --git a/src/tests.scm b/src/tests.scm index 778c04d..e2a65f4 100644 --- a/src/tests.scm +++ b/src/tests.scm @@ -36,6 +36,7 @@ util-dict-list cal-month cal-period + cal-day util-list ansi command-line @@ -53,6 +54,7 @@ (ldict-tests!) (cal-month-tests!) (cal-period-tests!) + (cal-day-tests!) (util-list-tests!) (ansi-tests!) (command-line-tests!)