[wasm] Rename wasm-js-test target to wasm-test

titzer · Jul 30, 2024 · c115958 · c115958
1 parent 7fca17d
commit c115958
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 28 deletions.
diff --git a/aeneas/src/main/Version.v3 b/aeneas/src/main/Version.v3
@@ -3,6 +3,6 @@
 
 // Updated by VCS scripts. DO NOT EDIT.
 component Version {
-	def version: string = "III-7.1750";
+	def version: string = "III-7.1751";
 	var buildData: string;
 }
diff --git a/aeneas/src/wasm/WasmTarget.v3 b/aeneas/src/wasm/WasmTarget.v3
@@ -9,8 +9,7 @@
 // Install targets into registry for the compiler
 component WasmComponent {
 	new() {
-		Aeneas.registerTarget(WasmTarget.new("wasm-js-test", true));
-		Aeneas.registerTarget(WasmTarget.new("wasm-spec-test", true));
+		Aeneas.registerTarget(WasmTarget.new("wasm-test", true));
 		Aeneas.registerTarget(WasmTarget.new("wasm", false));
 	}
 }

diff --git a/test/bootstrap/test.bash b/test/bootstrap/test.bash
@@ -9,8 +9,8 @@ TEST_HOST=jar
 for target in $TEST_TARGETS; do
     if [ "$target" = "v3i" ]; then
 	continue # skip
-    elif [ "$target" = "wasm-js" ]; then
-	continue # TODO: wasm-js bootstrap
+    elif [ "$target" = "wasm" ]; then
+	continue # TODO: wasm bootstrap
     elif [ "$target" = "jvm" ]; then
 	target=jar
     fi

diff --git a/test/common.bash b/test/common.bash
@@ -38,7 +38,7 @@ PROGRESS="${VIRGIL_LOC}/test/config/progress $PROGRESS_ARGS"
 XARGS=${XARGS:=0}
 
 AENEAS_TEST=${AENEAS_TEST:=$VIRGIL_LOC/bin/v3c}
-TEST_TARGETS=${TEST_TARGETS:="v3i jvm wasm-js x86-linux x86-64-linux x86-darwin x86-64-darwin"}
+TEST_TARGETS=${TEST_TARGETS:="v3i jvm wasm x86-linux x86-64-linux x86-darwin x86-64-darwin"}
 
 if [[ ! -x "$AENEAS_TEST" && "$AENEAS_TEST" != auto ]]; then
     echo $AENEAS_TEST: not found or not executable
@@ -343,10 +343,7 @@ function execute_target_tests() {
     if [ -d "$TEST_CACHE/$SUITE/$target" ]; then
 	print_status "   cached" ""
 	ext=""
-	if [ "$target" = "wasm-js" ]; then
-	   ext=".wasm"
-	fi
-	if [ "$target" = "wasm-spec" ]; then
+	if [ "$target" = "wasm" ]; then
 	   ext=".wasm"
 	fi
 	check_cached_target_tests $ext | tee $OUT/$target/cached.out | $PROGRESS
@@ -443,10 +440,7 @@ function get_io_targets() {
 	    jvm)
 		result="$result jar"
 		;;
-	    wasm-js)
-		result="$result wasm-wave" #TODO: wasm-linux
-		;;
-	    wasm-spec)
+	    wasm)
 		result="$result wasm-wave" #TODO: wasm-linux
 		;;
 	    *)

diff --git a/test/configure b/test/configure
@@ -147,19 +147,29 @@ else
 fi
 
 #############################################################################
-## target=wasm-js
-T="wasm-js"
+## target=wasm
+T="wasm"
 if [[ (! -L $CONFIG/test-$T) || (! -L $CONFIG/test-$T-node) ]]; then
     echo target=$T
 
+    U=wasm-js
     if [ -x "$D8" ]; then
 	green script $CONFIG/d8 $D8
 	echo '#!/bin/bash' > $CONFIG/d8
 	echo "exec $D8 \$@" >> $CONFIG/d8
 	chmod 755 $CONFIG/d8
-	try_link $BIN/test-$T@d8 test-$T@d8
+	try_link $BIN/test-$U@d8 test-$U@d8
     elif [[ -L $CONFIG/node ]]; then
-        try_link $BIN/test-$T@node test-$T@node
+        try_link $BIN/test-$U@node test-$U@node
+    else
+	print_skipped
+    fi
+
+    U=wasm-spec
+    if [[ -L $CONFIG/ref-spectest ]]; then
+        try_link $BIN/test-$U@ref test-$U@ref
+    elif [[ -L $CONFIG/wizeng-spectest ]]; then
+        try_link $BIN/test-$U@wizeng test-$U@wizeng
     else
 	print_skipped
     fi
@@ -171,13 +181,6 @@ T="wasm-spec"
 if [[ (! -L $CONFIG/test-$T) ]]; then
     echo target=$T
 
-    if [[ -L $CONFIG/ref-spectest ]]; then
-        try_link $BIN/test-$T@ref test-$T@ref
-    elif [[ -L $CONFIG/wizeng-spectest ]]; then
-        try_link $BIN/test-$T@wizeng test-$T@wizeng
-    else
-	print_skipped
-    fi
 fi
 
 #############################################################################

diff --git a/test/pointer/test.bash b/test/pointer/test.bash
@@ -14,9 +14,7 @@ for target in $TEST_TARGETS; do
 	continue # skip because not native target
     elif [[ "$target" = jvm || "$target" = jar ]]; then
 	continue # skip because not native
-    elif [ "$target" = wasm-js ]; then
-	TESTS=$(ls $TEST_LIST | grep -v _64.v3)
-    elif [ "$target" = wasm-spec ]; then
+    elif [ "$target" = wasm ]; then
 	TESTS=$(ls $TEST_LIST | grep -v _64.v3)
     elif [ "$target" = x86-linux ]; then
 	TESTS=$(ls $TEST_LIST | grep -v _64.v3)