diff options
author | Gus Caplan <me@gus.host> | 2019-01-05 18:58:16 -0600 |
---|---|---|
committer | Gus Caplan <me@gus.host> | 2019-01-08 12:57:24 -0600 |
commit | 0c8dedd103f78e3f6f9cc907240b9beaabdf12c3 (patch) | |
tree | f93b936c8f68c2b3568d813954a9ff1b4a0c4083 /test | |
parent | 9987f1abb92461af5b2da61befe7ce0c1ab19503 (diff) | |
download | android-node-v8-0c8dedd103f78e3f6f9cc907240b9beaabdf12c3.tar.gz android-node-v8-0c8dedd103f78e3f6f9cc907240b9beaabdf12c3.tar.bz2 android-node-v8-0c8dedd103f78e3f6f9cc907240b9beaabdf12c3.zip |
test: clean up wasm fixtures
PR-URL: https://github.com/nodejs/node/pull/25360
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/fixtures/shared-memory.wasm | bin | 0 -> 26 bytes | |||
-rw-r--r-- | test/fixtures/shared-memory.wat | 8 | ||||
-rw-r--r-- | test/fixtures/simple.wasm | bin | 0 -> 41 bytes | |||
-rw-r--r-- | test/fixtures/simple.wat | 11 | ||||
-rw-r--r-- | test/fixtures/test.wasm | bin | 50 -> 0 bytes | |||
-rw-r--r-- | test/fixtures/test.wat | 10 | ||||
-rw-r--r-- | test/fixtures/wasm-threads-shared-memory.wasm | bin | 36 -> 0 bytes | |||
-rw-r--r-- | test/fixtures/wasm-threads-shared-memory.wat | 4 | ||||
-rw-r--r-- | test/parallel/test-util-types.js | 2 | ||||
-rw-r--r-- | test/parallel/test-v8-serdes.js | 4 | ||||
-rw-r--r-- | test/parallel/test-wasm-simple.js | 4 | ||||
-rw-r--r-- | test/parallel/test-worker-message-port-wasm-module.js | 4 | ||||
-rw-r--r-- | test/parallel/test-worker-message-port-wasm-threads.js | 2 |
13 files changed, 27 insertions, 22 deletions
diff --git a/test/fixtures/shared-memory.wasm b/test/fixtures/shared-memory.wasm Binary files differnew file mode 100644 index 0000000000..497b8440bd --- /dev/null +++ b/test/fixtures/shared-memory.wasm diff --git a/test/fixtures/shared-memory.wat b/test/fixtures/shared-memory.wat new file mode 100644 index 0000000000..9dbaf7fa7f --- /dev/null +++ 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)) +)
\ No newline at end of file diff --git a/test/fixtures/simple.wasm b/test/fixtures/simple.wasm Binary files differnew file mode 100644 index 0000000000..357f72da7a --- /dev/null +++ b/test/fixtures/simple.wasm diff --git a/test/fixtures/simple.wat b/test/fixtures/simple.wat new file mode 100644 index 0000000000..e3026bffe5 --- /dev/null +++ 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 Binary files differdeleted file mode 100644 index da1b033006..0000000000 --- a/test/fixtures/test.wasm +++ /dev/null diff --git a/test/fixtures/test.wat b/test/fixtures/test.wat deleted file mode 100644 index fa90b17cce..0000000000 --- a/test/fixtures/test.wat +++ /dev/null @@ -1,10 +0,0 @@ -;; Compiled using the WebAssembly Tootkit (https://github.com/WebAssembly/wabt) -;; $ wat2wasm test.wat -o test.wasm -(module - (func $add (export "add") (param $first i32) (param $second i32) (result i32) - get_local $first - get_local $second - (i32.add) - ) - (export "addTwo" (func $add)) -) diff --git a/test/fixtures/wasm-threads-shared-memory.wasm b/test/fixtures/wasm-threads-shared-memory.wasm Binary files differdeleted file mode 100644 index 24b4d69105..0000000000 --- a/test/fixtures/wasm-threads-shared-memory.wasm +++ /dev/null diff --git a/test/fixtures/wasm-threads-shared-memory.wat b/test/fixtures/wasm-threads-shared-memory.wat deleted file mode 100644 index 68a2698df6..0000000000 --- a/test/fixtures/wasm-threads-shared-memory.wat +++ /dev/null @@ -1,4 +0,0 @@ -(module - (memory $mem 1 2 shared) - (export "memory" (memory $mem)) -)
\ No newline at end of file diff --git a/test/parallel/test-util-types.js b/test/parallel/test-util-types.js index eba8583ee7..19b265ca2a 100644 --- 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 index 3f88503546..def4914e2e 100644 --- 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 index ebcb366d55..f769925be9 100644 --- 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 index 43c12a8519..922d8b11a3 100644 --- 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 index 891da80e30..90b18cd759 100644 --- 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); |