From 8cda4cf9621aacd84e7bbecf87dba859b4877942 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt@mmmccormick.com>
Date: Sun, 29 Dec 2024 18:59:52 -0500
Subject: [PATCH] web-wasi-threads: add .test, .push-$(HOST_ARCH) targets

---
 Makefile                       | 13 ++++---------
 web-wasi-threads/Dockerfile.in |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 5b44e26..b26ab02 100644
--- a/Makefile
+++ b/Makefile
@@ -166,8 +166,8 @@ web-wasm.test: web-wasm
 web-wasi-threads: web-wasi web-wasi-threads/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	cp -r test web-wasi-threads/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/web-wasi-threads:$(TAG) \
-		-t $(ORG)/web-wasi-threads:latest \
+	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/web-wasi-threads:$(TAG)-$(HOST_ARCH) \
+		-t $(ORG)/web-wasi-threads:latest-$(HOST_ARCH) \
 		--build-arg IMAGE=$(ORG)/web-wasi-threads \
 		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
@@ -175,11 +175,6 @@ web-wasi-threads: web-wasi web-wasi-threads/Dockerfile
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		web-wasi-threads
 
-web-wasi-threads.test: web-wasi-threads
-	$(TEST_DOCKER) run $(RM) $(ORG)/web-wasi-threads:latest > $(BIN)/dockcross-web-wasi-threads \
-		&& chmod +x $(BIN)/dockcross-web-wasi-threads
-	$(BIN)/dockcross-web-wasi-threads -i $(ORG)/web-wasi-threads:latest python3 test/run.py
-	rm -rf web-wasi-threads/test
 #
 # manylinux2014-aarch64
 #
@@ -353,13 +348,13 @@ $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@)
 	$(BIN)/dockcross-$(basename $@) -i $(ORG)/$(basename $@):latest python3 test/run.py $($@_ARGS)
 
 .SECONDEXPANSION:
-$(addsuffix .test,$(MULTIARCH_IMAGES)): $$(basename $$@)
+$(addsuffix .test,$(MULTIARCH_IMAGES) web-wasi-threads): $$(basename $$@)
 	$(TEST_DOCKER) run $(RM) $(ORG)/$(basename $@):latest-$(HOST_ARCH) > $(BIN)/dockcross-$(basename $@) \
 		&& chmod +x $(BIN)/dockcross-$(basename $@)
 	$(BIN)/dockcross-$(basename $@) -i $(ORG)/$(basename $@):latest-$(HOST_ARCH) python3 test/run.py $($@_ARGS)
 
 .SECONDEXPANSION:
-$(addsuffix .push-$(HOST_ARCH),$(MULTIARCH_IMAGES)): $$(basename $$@)
+$(addsuffix .push-$(HOST_ARCH),$(MULTIARCH_IMAGES) web-wasi-threads): $$(basename $$@)
 	$(BUILD_DOCKER) push $(ORG)/$(basename $@):latest-$(HOST_ARCH) \
 		&& $(BUILD_DOCKER) push $(ORG)/$(basename $@):$(TAG)-$(HOST_ARCH)
 
diff --git a/web-wasi-threads/Dockerfile.in b/web-wasi-threads/Dockerfile.in
index 5f75c21..3f471ee 100644
--- a/web-wasi-threads/Dockerfile.in
+++ b/web-wasi-threads/Dockerfile.in
@@ -6,6 +6,6 @@ LABEL maintainer="Matt McCormick matt@mmmccormick.com"
 ENV CROSS_TRIPLE=wasm32-wasi-threads
 
 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
 
 #include "common.label-and-env"