Skip to content

Commit

Permalink
Attempt to pull slm deps as part of the test run
Browse files Browse the repository at this point in the history
  • Loading branch information
callendorph committed Sep 13, 2024
1 parent 33fcf59 commit 97dee62
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
SLM_STANZA ?= jstanza
STANZA := $(SLM_STANZA)
CWD := $(shell pwd)
SLM := $(SLM)

# execute all lines of a target in one shell
.ONESHELL:
Expand Down Expand Up @@ -58,12 +59,18 @@ FILLETS_NAME=jsl/landpatterns/leads/lead-fillets-table
$(FILLETS): $(FILLETS_CSV) tabgen
$(TABGEN) generate $(FILLETS_CSV) -f $@ -pkg-name $(FILLETS_NAME) -force

fetch-deps:
# This forces SLM to fetch the dependencies
# it will fail - but we don't care as longs as the
# deps get fetched.
-$(SLM) build fetch-deps

.PHONY: tests
tests:
tests: fetch-deps
$(STANZA) run-test $(JSL_TESTS)

.PHONY: test-%
test-%:
test-%: fetch-deps
$(STANZA) run-test $(JSL_TESTS) -tagged $(@:test-%=%) | grep -v "SKIP" | awk NF

.PHONY: clean
Expand Down
10 changes: 10 additions & 0 deletions stanza.proj
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
include? ".slm/stanza.proj" ; Dependencies
pkg-cache: ".slm/pkg-cache"

packages jsl/* defined-in "./src/"

packages jsl/tests/* defined-in "./tests/"
packages jsl/tests/landpatterns/* defined-in "./tests/landpatterns/"
packages jsl/examples/* defined-in "./examples/"

; This target's only purpose is to allow a target that
; SLM can build to drive the dependency resolution.
build fetch-deps:
inputs:
jsl/tests/math
o: "quadand"

0 comments on commit 97dee62

Please sign in to comment.