From 6ca0e7760472fbec78d6da9572cb130cb7b7cd91 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Tue, 17 Jun 2025 21:57:04 +0100 Subject: [PATCH] add Makefile targets to run in-place and to run tests --- pkgs/maps/Makefile | 8 +++++++- pkgs/maps/main.fnl | 2 +- pkgs/maps/run-tests.fnl | 10 ++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/maps/run-tests.fnl diff --git a/pkgs/maps/Makefile b/pkgs/maps/Makefile index 48237d5..c220aa6 100644 --- a/pkgs/maps/Makefile +++ b/pkgs/maps/Makefile @@ -2,7 +2,7 @@ FENNEL?=fennel PREFIX?=/usr/local NAME?=maps -MODULES=main.fnl +MODULES=main.fnl tiles.fnl %.lua : %.fnl $(FENNEL) --compile $< > $@ @@ -11,6 +11,12 @@ $(NAME): $(patsubst %.fnl,%.lua,$(MODULES)) Makefile (echo -e "#!/usr/bin/env lua\n" ; cat main.lua ) > $@ chmod +x $@ +run: + ( fennel fake-nmea.fnl commute.nmea /tmp/gnss & ) ; sleep 1; fennel -e '((. (require :main) :run) "/tmp/gnss")' + +test: + fennel run-tests.fnl $(MODULES) + install: mkdir -p $(PREFIX)/bin $(PREFIX)/ cp $(NAME) $(PREFIX)/bin diff --git a/pkgs/maps/main.fnl b/pkgs/maps/main.fnl index 178b31b..3247ff8 100644 --- a/pkgs/maps/main.fnl +++ b/pkgs/maps/main.fnl @@ -514,4 +514,4 @@ label.readout { (when (os.getenv "MAP_PROFILE") (collect-profile)) (Gtk:main)) -(run (table.unpack arg)) +{ : run } diff --git a/pkgs/maps/run-tests.fnl b/pkgs/maps/run-tests.fnl new file mode 100644 index 0000000..a07a3d7 --- /dev/null +++ b/pkgs/maps/run-tests.fnl @@ -0,0 +1,10 @@ +(local fennel (require :fennel)) +(local specials (require :fennel.specials)) + +(local compiler-env + (doto (. (specials.make-compiler-env) :_G) + (tset "RUNNING_TESTS" true))) + +(each [_ f (ipairs arg)] + (print :testing f) + (fennel.dofile f { :correlate true :compilerEnv compiler-env }))