Merge branch 'main' into regular-benches

Author: stupendoussuperpowers

.github/workflows/e2e.yml

@@ -6,7 +6,10 @@ on:
   push:
     branches:
       - main
-
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+  
 permissions:
   pull-requests: write
 
@@ -22,6 +25,9 @@ jobs:
     env:
       REPORT_LOCAL_DIR: test-reports
       REPORT_LOCAL_FILE: wasm-e2e-report.html
+      WASM_REPORT_JSON_FILE: wasm.json
+      GRATE_REPORT_JSON_FILE: grates.json
+      REPORT_HTML_IN_REPORTS: report.html
       COMMENT_LOCAL_FILE: e2e_comment.md
 
     steps:
@@ -31,7 +37,7 @@ jobs:
       # First attempt at build
       - name: Build e2e (attempt 1)
         id: build_e2e_try1
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@601a80b39c9405e50806ae38af30926f9d957c47 # v6.19.1
         with:
           platforms: linux/amd64
           cache-from: type=gha
@@ -49,7 +55,7 @@ jobs:
       - name: Build e2e (attempt 2)
         id: build_e2e_try2
         if: steps.build_e2e_try1.outcome == 'failure'
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@601a80b39c9405e50806ae38af30926f9d957c47 # v6.19.1
         with:
           platforms: linux/amd64
           cache-from: type=gha
@@ -67,7 +73,7 @@ jobs:
       - name: Build e2e (attempt 3)
         id: build_e2e_try3
         if: steps.build_e2e_try2.outcome == 'failure'
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@601a80b39c9405e50806ae38af30926f9d957c47 # v6.19.1
         with:
           platforms: linux/amd64
           cache-from: type=gha
@@ -99,7 +105,35 @@ jobs:
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
         with:
           name: wasm-e2e-report
-          path: ${{ env.REPORT_LOCAL_DIR }}/${{ env.REPORT_LOCAL_FILE }}
+          path: |
+            ${{ env.REPORT_LOCAL_DIR }}/reports/${{ env.REPORT_HTML_IN_REPORTS }}
+            ${{ env.REPORT_LOCAL_DIR }}/${{ env.REPORT_LOCAL_FILE }}
+          if-no-files-found: error
+          retention-days: 7
+
+      - name: Upload wasm JSON report artifact
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        with:
+          name: wasm-e2e-json
+          path: ${{ env.REPORT_LOCAL_DIR }}/reports/${{ env.WASM_REPORT_JSON_FILE }}
+          if-no-files-found: error
+          retention-days: 7
+
+      - name: Upload grate JSON report artifact
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        with:
+          name: grate-e2e-json
+          path: ${{ env.REPORT_LOCAL_DIR }}/reports/${{ env.GRATE_REPORT_JSON_FILE }}
+          if-no-files-found: error
+          retention-days: 7
+
+      - name: Upload unified runner HTML report artifact
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        with:
+          name: wasm-e2e-unified-html
+          path: |
+            ${{ env.REPORT_LOCAL_DIR }}/reports/${{ env.REPORT_HTML_IN_REPORTS }}
+            ${{ env.REPORT_LOCAL_DIR }}/${{ env.REPORT_LOCAL_FILE }}
           if-no-files-found: error
           retention-days: 7
 
@@ -120,4 +154,4 @@ jobs:
         if: steps.e2e.outputs.E2E_STATUS == 'fail'
         run: |
           echo "Tests failed; failing job after posting the report/comment."
-          exit 1
+          exit 1

.gitignore

@@ -20,3 +20,5 @@ results.json
 #Ignore local files
 .DS_Store
 target/
+#Ignore python cache
+__pycache__/

Docker/Dockerfile.e2e

@@ -151,8 +151,13 @@ RUN install -D -m 0755 /scripts/lind_compile /usr/local/bin/lind_compile \
 
 # Run all tests, print results, and exit with 1, if any test fails; 0 otherwise
 FROM base AS test
+ENV LIND_WASM_ROOT=/
 COPY --parents scripts tests tools skip_test_cases.txt Makefile .
-RUN chmod 0755 /scripts/wasmtestreport.py /scripts/lind_compile /scripts/lind_run
+RUN chmod 0755 /scripts/wasmtestreport.py /scripts/test_runner.py /scripts/lind_compile /scripts/lind_run \
+ && install -D -m 0755 /scripts/lind_compile /usr/local/bin/lind_compile \
+ && install -D -m 0755 /scripts/lind_run     /usr/local/bin/lind_run \
+ && ln -sf /usr/local/bin/lind_compile /usr/local/bin/lind-clang \
+ && ln -sf /usr/local/bin/lind_run     /usr/local/bin/lind-wasm
 # Create symlink so hardcoded paths in wasmtime match Docker environment
 RUN mkdir -p /home/lind && ln -sf / /home/lind/lind-wasm
 # NOTE: Build artifacts from prior stages are only mounted, to save COPY time
@@ -161,10 +166,11 @@ RUN --mount=from=build-lind-boot,source=src/lind-boot/target,destination=src/lin
     --mount=from=build-lind-boot,source=build/lind-boot,destination=/build/lind-boot \
     --mount=from=build-glibc,source=src/glibc/sysroot,destination=src/glibc/sysroot \
     make test && \
-    OUT_DIR=/ REPORT_PATH=/report.html make md_generation
+    make md_generation OUT=/ REPORT=/report.html
 
 
 FROM scratch AS artifacts
 COPY --from=test /report.html /wasm-e2e-report.html
+COPY --from=test /reports /reports
 COPY --from=test /e2e_comment.md /e2e_comment.md
 COPY --from=test /e2e_status /e2e_status

Makefile

@@ -11,7 +11,9 @@ LINDFS_DIRS := \
 	       tmp \
 	       usr/bin \
 	       usr/lib \
+	       usr/lib/locale \
 	       usr/local/bin \
+	       usr/share/zoneinfo \
 	       var \
 	       var/log \
 	       var/run
@@ -41,6 +43,8 @@ lindfs:
 	done
 	touch $(LINDFS_ROOT)/dev/null
 	cp -rT scripts/lindfs-conf/etc $(LINDFS_ROOT)/etc
+	cp -rT scripts/lindfs-conf/usr/lib/locale $(LINDFS_ROOT)/usr/lib/locale
+	cp -rT scripts/lindfs-conf/usr/share/zoneinfo $(LINDFS_ROOT)/usr/share/zoneinfo
 
 .PHONY: lind-debug
 lind-debug: build-dir
@@ -69,18 +73,17 @@ sync-sysroot:
 
 .PHONY: test
 test: lindfs
-	# NOTE: `grep` workaround required for lack of meaningful exit code in wasmtestreport.py
+	# Unified harness entry point (run all discovered harnesses for e2e signal)
 	LIND_WASM_BASE=. LINDFS_ROOT=$(LINDFS_ROOT) \
-	./scripts/wasmtestreport.py --allow-pre-compiled && \
-	cat results.json; \
-	if grep -q '"number_of_failures": [^0]' results.json; then \
-	  echo "E2E_STATUS=fail" > e2e_status; \
-	else \
+	python3 ./scripts/test_runner.py --export-report report.html && \
+	find reports -maxdepth 1 -name '*.json' -print -exec cat {} \;; \
+	if python3 -c "import glob,json,sys; paths=glob.glob('reports/*.json'); total=sum(int(json.load(open(p)).get('number_of_failures', 0)) for p in paths); print(f'total_failures={total}'); sys.exit(1 if total else 0)"; then \
 	  echo "E2E_STATUS=pass" > e2e_status; \
+	else \
+	  echo "E2E_STATUS=fail" > e2e_status; \
 	fi; \
 	exit 0
 
-
 .PHONY: md_generation
 OUT ?= .
 REPORT ?= report.html
@@ -142,5 +145,6 @@ clean:
 distclean: clean
 	@echo "removing test outputs & temp files"
 	$(RM) -f results.json report.html e2e_status
+	$(RM) -r reports || true
 	$(RM) -r $(LINDFS_ROOT)/testfiles || true
-	find tests -type f \( -name '*.wasm' -o -name '*.cwasm' -o -name '*.o' \) -delete
+	find tests -type f \( -name '*.wasm' -o -name '*.cwasm' -o -name '*.o' \) -delete

scripts/cargo-lind_compile

@@ -29,6 +29,7 @@ export CARGO_TARGET_WASM32_WASIP1_RUSTFLAGS="\
 -C link-arg=-Wl,--max-memory=67108864 \
 -C link-arg=-Wl,--export=__stack_pointer \
 -C link-arg=-Wl,--export=__stack_low \
+-C link-arg=-Wl,--export=__tls_base \
 -C link-arg=-Wl,--export=pass_fptr_to_wt"
 
 # Set wasm-opt and wasmtime paths (allow override via environment variables)

scripts/harnesses/__init__.py

@@ -0,0 +1 @@
+"""Test harness modules for the unified test runner."""