test: clean up wasm fixtures

PR-URL: #25360 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Jan 8, 2019 · c826af7 · c826af7
1 parent c1aa5f0
commit c826af7
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 22 deletions.
diff --git a/test/fixtures/shared-memory.wasm b/test/fixtures/shared-memory.wasm
diff --git a/test/fixtures/shared-memory.wat b/test/fixtures/shared-memory.wat
@@ -0,0 +1,8 @@
+;; Compiled using the WebAssembly Tootkit (https://github.com/WebAssembly/wabt)
+;; $ wat2wasm --enable-threads shared-memory.wat -o shared-memory.wasm
+
+(module
+  ;; Create shared memory with initial 1 page (64KiB) and max 1 page
+  (memory $mem 1 1 shared)
+  (export "memory" (memory $mem))
+)
diff --git a/test/fixtures/simple.wasm b/test/fixtures/simple.wasm
diff --git a/test/fixtures/simple.wat b/test/fixtures/simple.wat
@@ -0,0 +1,11 @@
+;; Compiled using the WebAssembly Tootkit (https://github.com/WebAssembly/wabt)
+;; $ wat2wasm simple.wat -o simple.wasm
+
+(module
+  (func $add (param $a i32) (param $b i32) (result i32)
+    ;; return $a + $b
+    (i32.add (get_local $a) (get_local $b))
+  )
+
+  (export "add" (func $add))
+)
diff --git a/test/fixtures/test.wasm b/test/fixtures/test.wasm
diff --git a/test/fixtures/test.wat b/test/fixtures/test.wat
diff --git a/test/fixtures/wasm-threads-shared-memory.wasm b/test/fixtures/wasm-threads-shared-memory.wasm
diff --git a/test/fixtures/wasm-threads-shared-memory.wat b/test/fixtures/wasm-threads-shared-memory.wat
diff --git a/test/parallel/test-util-types.js b/test/parallel/test-util-types.js
@@ -9,7 +9,7 @@ const { internalBinding } = require('internal/test/binding');
 const { JSStream } = internalBinding('js_stream');
 
 const external = (new JSStream())._externalStream;
-const wasmBuffer = fixtures.readSync('test.wasm');
+const wasmBuffer = fixtures.readSync('simple.wasm');
 
 for (const [ value, _method ] of [
   [ external, 'isExternal' ],

diff --git a/test/parallel/test-v8-serdes.js b/test/parallel/test-v8-serdes.js
@@ -12,7 +12,7 @@ const os = require('os');
 const circular = {};
 circular.circular = circular;
 
-const wasmModule = new WebAssembly.Module(fixtures.readSync('test.wasm'));
+const wasmModule = new WebAssembly.Module(fixtures.readSync('simple.wasm'));
 
 const objects = [
   { foo: 'bar' },
@@ -238,5 +238,5 @@ const deserializerTypeError =
 {
   const deserializedWasmModule = v8.deserialize(v8.serialize(wasmModule));
   const instance = new WebAssembly.Instance(deserializedWasmModule);
-  assert.strictEqual(instance.exports.addTwo(10, 20), 30);
+  assert.strictEqual(instance.exports.add(10, 20), 30);
 }
diff --git a/test/parallel/test-wasm-simple.js b/test/parallel/test-wasm-simple.js
@@ -4,14 +4,14 @@ require('../common');
 const assert = require('assert');
 const fixtures = require('../common/fixtures');
 
-const buffer = fixtures.readSync('test.wasm');
+const buffer = fixtures.readSync('simple.wasm');
 
 assert.ok(WebAssembly.validate(buffer), 'Buffer should be valid WebAssembly');
 
 WebAssembly.instantiate(buffer, {}).then((results) => {
   // Exported function should add two numbers.
   assert.strictEqual(
-    results.instance.exports.addTwo(10, 20),
+    results.instance.exports.add(10, 20),
     30
   );
 });
diff --git a/test/parallel/test-worker-message-port-wasm-module.js b/test/parallel/test-worker-message-port-wasm-module.js
@@ -5,13 +5,13 @@ const assert = require('assert');
 const fixtures = require('../common/fixtures');
 
 const { Worker } = require('worker_threads');
-const wasmModule = new WebAssembly.Module(fixtures.readSync('test.wasm'));
+const wasmModule = new WebAssembly.Module(fixtures.readSync('simple.wasm'));
 
 const worker = new Worker(`
 const { parentPort } = require('worker_threads');
 parentPort.once('message', ({ wasmModule }) => {
   const instance = new WebAssembly.Instance(wasmModule);
-  parentPort.postMessage(instance.exports.addTwo(10, 20));
+  parentPort.postMessage(instance.exports.add(10, 20));
 });
 `, { eval: true });
 

diff --git a/test/parallel/test-worker-message-port-wasm-threads.js b/test/parallel/test-worker-message-port-wasm-threads.js
@@ -8,7 +8,7 @@ const { MessageChannel, Worker } = require('worker_threads');
 // through MessageChannels (without crashing).
 
 const fixtures = require('../common/fixtures');
-const wasmSource = fixtures.readSync('wasm-threads-shared-memory.wasm');
+const wasmSource = fixtures.readSync('shared-memory.wasm');
 const wasmModule = new WebAssembly.Module(wasmSource);
 const instance = new WebAssembly.Instance(wasmModule);