From 5396117397cda16a4ab23e6c098253af20f085ff Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 12 Feb 2024 19:31:25 +0000
Subject: Only include Patio test functions for Patio tests

---
 .../org/shedlang/compiler/backends/wasm/PatioToWasmTests.java |  2 +-
 .../shedlang/compiler/backends/wasm/Wasm32ExampleTests.java   |  2 +-
 .../shedlang/compiler/backends/wasm/Wasm64ExampleTests.java   |  2 +-
 .../java/org/shedlang/compiler/backends/wasm/WasmTesting.java | 11 ++++++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/test/java')

diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java
index ed0380ea..868187a8 100644
--- a/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java
@@ -54,7 +54,7 @@ public abstract class PatioToWasmTests extends PatioExampleTests {
         WasmBinaryFormatTesting.validate(executablePath, wasmTarget());
 
         return TestProcessRunner.runCaptureOutput(Lists.concat(
-            WasmTesting.binaryRunner(wasmTarget()),
+            WasmTesting.patioTestBinaryRunner(wasmTarget()),
             List.of(
                 executablePath.toString()
             )
diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/Wasm32ExampleTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/Wasm32ExampleTests.java
index c7f2d0b5..e4dd5a75 100644
--- a/src/test/java/org/shedlang/compiler/backends/wasm/Wasm32ExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/wasm/Wasm32ExampleTests.java
@@ -13,7 +13,7 @@ public class Wasm32ExampleTests extends ExampleTests {
 
     @Override
     protected List<String> binaryRunner() {
-        return WasmTesting.binaryRunner(WasmTarget.WASM32);
+        return WasmTesting.wasiBinaryRunner(WasmTarget.WASM32);
     }
 
     @Override
diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/Wasm64ExampleTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/Wasm64ExampleTests.java
index c810579b..db0ed00a 100644
--- a/src/test/java/org/shedlang/compiler/backends/wasm/Wasm64ExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/wasm/Wasm64ExampleTests.java
@@ -13,7 +13,7 @@ public class Wasm64ExampleTests extends ExampleTests {
 
     @Override
     protected List<String> binaryRunner() {
-        return WasmTesting.binaryRunner(WasmTarget.WASM64);
+        return WasmTesting.wasiBinaryRunner(WasmTarget.WASM64);
     }
 
     @Override
diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/WasmTesting.java b/src/test/java/org/shedlang/compiler/backends/wasm/WasmTesting.java
index 9acab6ce..f4f86440 100644
--- a/src/test/java/org/shedlang/compiler/backends/wasm/WasmTesting.java
+++ b/src/test/java/org/shedlang/compiler/backends/wasm/WasmTesting.java
@@ -1,5 +1,6 @@
 package org.shedlang.compiler.backends.wasm;
 
+import org.pcollections.PVector;
 import org.shedlang.compiler.filesystem.ShedCompilerFiles;
 import org.shedlang.compiler.util.P;
 
@@ -9,7 +10,15 @@ public class WasmTesting {
     private WasmTesting() {
     }
 
-    public static List<String> binaryRunner(WasmTarget target) {
+    public static List<String> patioTestBinaryRunner(WasmTarget target) {
+        return binaryRunner(target).plus("--patio-test").plus("--");
+    }
+
+    public static List<String> wasiBinaryRunner(WasmTarget target) {
+        return binaryRunner(target).plus("--");
+    }
+
+    private static PVector<String> binaryRunner(WasmTarget target) {
         return P.vector(
             "node",
             "--experimental-wasi-unstable-preview1",
-- 
cgit v1.2.3