Fix memory64 tests (#3702)

1) Use 'address' instead of 'index'; this was a last-minute change, see WebAssembly/memory64#90 and WebAssembly/memory64#92. 2) Only treat RangeError as passing test. Note that the tests were passing before because engines threw a TypeError if the memory descriptor used bigints without specifying {address: 'i64'}.
KhronosGroup · Dec 10, 2024 · 2010c61 · 2010c61
1 parent c5f8d7b
commit 2010c61
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/sdk/tests/conformance2/wasm/bufferdata-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/bufferdata-16gb-wasm-memory.html
@@ -29,9 +29,10 @@
 (() => {
   let view;
   try {
-    view = new Uint8Array(new WebAssembly.Memory({ index: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
+    view = new Uint8Array(new WebAssembly.Memory({ address: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
   } catch (e) {
-    testPassed(`Allocating ${SIZE} threw: ${e}`);
+    let fn = e instanceof RangeError ? testPassed : testFailed;
+    fn(`Allocating ${SIZE} threw: ${e}`);
     return;
   }
 

diff --git a/sdk/tests/conformance2/wasm/buffersubdata-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/buffersubdata-16gb-wasm-memory.html
@@ -29,9 +29,10 @@
 (() => {
   let view;
   try {
-    view = new Uint8Array(new WebAssembly.Memory({ index: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
+    view = new Uint8Array(new WebAssembly.Memory({ address: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
   } catch (e) {
-    testPassed(`Allocating ${SIZE} threw: ${e}`);
+    let fn = e instanceof RangeError ? testPassed : testFailed;
+    fn(`Allocating ${SIZE} threw: ${e}`);
     return;
   }
 

diff --git a/sdk/tests/conformance2/wasm/getbuffersubdata-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/getbuffersubdata-16gb-wasm-memory.html
@@ -29,9 +29,10 @@
 (() => {
   let view;
   try {
-    view = new Uint8Array(new WebAssembly.Memory({ index: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
+    view = new Uint8Array(new WebAssembly.Memory({ address: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
   } catch (e) {
-    testPassed(`Allocating ${SIZE} threw: ${e}`);
+    let fn = e instanceof RangeError ? testPassed : testFailed;
+    fn(`Allocating ${SIZE} threw: ${e}`);
     return;
   }
 

diff --git a/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html
@@ -30,9 +30,10 @@
 (() => {
   let view;
   try {
-    view = new Uint8Array(new WebAssembly.Memory({ index: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
+    view = new Uint8Array(new WebAssembly.Memory({ address: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
   } catch (e) {
-    testPassed(`Allocating ${SIZE} threw: ${e}`);
+    let fn = e instanceof RangeError ? testPassed : testFailed;
+    fn(`Allocating ${SIZE} threw: ${e}`);
     return;
   }
 

diff --git a/sdk/tests/conformance2/wasm/teximage2d-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/teximage2d-16gb-wasm-memory.html
@@ -29,9 +29,10 @@
 (() => {
   let view;
   try {
-    view = new Uint8Array(new WebAssembly.Memory({ index: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
+    view = new Uint8Array(new WebAssembly.Memory({ address: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
   } catch (e) {
-    testPassed(`Allocating ${SIZE} threw: ${e}`);
+    let fn = e instanceof RangeError ? testPassed : testFailed;
+    fn(`Allocating ${SIZE} threw: ${e}`);
     return;
   }
 

diff --git a/sdk/tests/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html
@@ -29,9 +29,10 @@
 (() => {
   let view;
   try {
-    view = new Uint8Array(new WebAssembly.Memory({ index: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
+    view = new Uint8Array(new WebAssembly.Memory({ address: 'i64', initial: BigInt(SIZE / PAGE) }).buffer);
   } catch (e) {
-    testPassed(`Allocating ${SIZE} threw: ${e}`);
+    let fn = e instanceof RangeError ? testPassed : testFailed;
+    fn(`Allocating ${SIZE} threw: ${e}`);
     return;
   }