From a95391aa8a50ff90e1c5cd4398062859ec17b797 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Thu, 30 Nov 2023 11:51:45 +0000 Subject: [PATCH 1/2] fix: restore missing Makefile `test` targets I accidentally deleted these targets when adding the Wasm32 targets. Signed-off-by: Drew Hess --- primer-api/Makefile | 3 +++ primer/Makefile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/primer-api/Makefile b/primer-api/Makefile index 0ff34f4c8..aadd54747 100644 --- a/primer-api/Makefile +++ b/primer-api/Makefile @@ -25,6 +25,9 @@ check: test wasm32-check: wasm32-test +test: + cabal test + wasm32-test: tasty-discover test/Test.hs _ test/TestsWasm32.hs --tree-display wasm32-wasi-cabal build test:primer-api-test diff --git a/primer/Makefile b/primer/Makefile index 3596213ea..55af310f1 100644 --- a/primer/Makefile +++ b/primer/Makefile @@ -25,6 +25,9 @@ check: test wasm32-check: wasm32-test +test: + cabal test + wasm32-test: tasty-discover test/Test.hs _ test/TestsWasm32.hs --tree-display wasm32-wasi-cabal build test:primer-test From ada0fa542796d4d4d47accfd38496d4d8d78a9e7 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Thu, 30 Nov 2023 11:52:53 +0000 Subject: [PATCH 2/2] fix: Wasm32 Makefile `shell` commands should be lazy Signed-off-by: Drew Hess --- primer-api/Makefile | 4 ++-- primer/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/primer-api/Makefile b/primer-api/Makefile index aadd54747..ee663a006 100644 --- a/primer-api/Makefile +++ b/primer-api/Makefile @@ -3,8 +3,8 @@ # Most commands assume you're running this from the top-level `nix # develop` shell. -wasm32-primer-api-test := $(shell wasm32-wasi-cabal list-bin -v0 test:primer-api-test) -wasm32-primer-api-test-opt := $(shell wasm32-wasi-cabal list-bin -O2 -v0 test:primer-api-test) +wasm32-primer-api-test = $(shell wasm32-wasi-cabal list-bin -v0 test:primer-api-test) +wasm32-primer-api-test-opt = $(shell wasm32-wasi-cabal list-bin -O2 -v0 test:primer-api-test) build: cabal build diff --git a/primer/Makefile b/primer/Makefile index 55af310f1..791620a5e 100644 --- a/primer/Makefile +++ b/primer/Makefile @@ -3,8 +3,8 @@ # Most commands assume you're running this from the top-level `nix # develop` shell. -wasm32-primer-test := $(shell wasm32-wasi-cabal list-bin -v0 test:primer-test) -wasm32-primer-test-opt := $(shell wasm32-wasi-cabal list-bin -O2 -v0 test:primer-test) +wasm32-primer-test = $(shell wasm32-wasi-cabal list-bin -v0 test:primer-test) +wasm32-primer-test-opt = $(shell wasm32-wasi-cabal list-bin -O2 -v0 test:primer-test) build: cabal build