summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/dump/current-memory.txt (renamed from test/dump/memory-size.txt)4
-rw-r--r--test/interp/spec/conversions.txt2
-rw-r--r--test/interp/spec/float_exprs.txt12
-rw-r--r--test/interp/spec/float_memory.txt18
-rw-r--r--test/interp/spec/float_misc.txt2
-rw-r--r--test/interp/spec/functions.txt2
-rw-r--r--test/interp/spec/labels.txt70
-rw-r--r--test/interp/spec/left-to-right.txt2
-rw-r--r--test/parse/expr/current-memory.txt3
-rw-r--r--test/parse/expr/memory-size.txt3
-rwxr-xr-xtest/run-tests.py8
11 files changed, 72 insertions, 54 deletions
diff --git a/test/dump/memory-size.txt b/test/dump/current-memory.txt
index 2cbb1fe7..c93882aa 100644
--- a/test/dump/memory-size.txt
+++ b/test/dump/current-memory.txt
@@ -2,7 +2,7 @@
(module
(memory 1)
(func (result i32)
- (memory_size)))
+ (current_memory)))
(;; STDOUT ;;;
0000000: 0061 736d ; WASM_BINARY_MAGIC
0000004: 0b00 0000 ; WASM_BINARY_VERSION
@@ -40,7 +40,7 @@
; function body 0
0000031: 00 ; func body size (guess)
0000032: 00 ; local decl count
-0000033: 3b ; OPCODE_MEMORY_SIZE
+0000033: 3b ; OPCODE_CURRENT_MEMORY
0000031: 02 ; FIXUP func body size
000002f: 04 ; FIXUP section size
;; dump
diff --git a/test/interp/spec/conversions.txt b/test/interp/spec/conversions.txt
index 98ca67bf..47228c3c 100644
--- a/test/interp/spec/conversions.txt
+++ b/test/interp/spec/conversions.txt
@@ -1,5 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/conversions.wast
(;; STDOUT ;;;
-300/300 tests passed.
+318/318 tests passed.
;;; STDOUT ;;)
diff --git a/test/interp/spec/float_exprs.txt b/test/interp/spec/float_exprs.txt
index a9de2c59..7f1780b2 100644
--- a/test/interp/spec/float_exprs.txt
+++ b/test/interp/spec/float_exprs.txt
@@ -1,5 +1,15 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/float_exprs.wast
(;; STDOUT ;;;
-236/236 tests passed.
+$invoke_0()
+$invoke_1()
+$invoke_2()
+$invoke_3()
+$invoke_8()
+$invoke_0()
+$invoke_1()
+$invoke_2()
+$invoke_3()
+$invoke_8()
+462/462 tests passed.
;;; STDOUT ;;)
diff --git a/test/interp/spec/float_memory.txt b/test/interp/spec/float_memory.txt
index c4e65bbb..d2fae3dc 100644
--- a/test/interp/spec/float_memory.txt
+++ b/test/interp/spec/float_memory.txt
@@ -1,5 +1,21 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/float_memory.wast
(;; STDOUT ;;;
-16/16 tests passed.
+$invoke_2()
+$invoke_5()
+$invoke_8()
+$invoke_11()
+$invoke_2()
+$invoke_5()
+$invoke_8()
+$invoke_11()
+$invoke_2()
+$invoke_5()
+$invoke_8()
+$invoke_11()
+$invoke_2()
+$invoke_5()
+$invoke_8()
+$invoke_11()
+40/40 tests passed.
;;; STDOUT ;;)
diff --git a/test/interp/spec/float_misc.txt b/test/interp/spec/float_misc.txt
index 2bbf94de..36a7a7e0 100644
--- a/test/interp/spec/float_misc.txt
+++ b/test/interp/spec/float_misc.txt
@@ -1,5 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/float_misc.wast
(;; STDOUT ;;;
-163/163 tests passed.
+323/323 tests passed.
;;; STDOUT ;;)
diff --git a/test/interp/spec/functions.txt b/test/interp/spec/functions.txt
index ee924a33..fdefb870 100644
--- a/test/interp/spec/functions.txt
+++ b/test/interp/spec/functions.txt
@@ -1,5 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/functions.wast
(;; STDOUT ;;;
-2/2 tests passed.
+10/10 tests passed.
;;; STDOUT ;;)
diff --git a/test/interp/spec/labels.txt b/test/interp/spec/labels.txt
index 2d8dd0c4..b43c96d2 100644
--- a/test/interp/spec/labels.txt
+++ b/test/interp/spec/labels.txt
@@ -1,55 +1,41 @@
-;;; NOTE: temporarily broken waiting for the testsuite update
-;;; ERROR: 1
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/labels.wast
-(;; STDERR ;;;
-Error running "sexpr-wasm":
-third_party/testsuite/labels.wast:247:18: expected module to be invalid
-(assert_invalid (module (func (loop $l (br $l (i32.const 0))))) "arity mismat...
- ^^^^^^
-third_party/testsuite/labels.wast:257:18: expected module to be invalid
-(assert_invalid (module (func (block $l0 (br_if $l0 (nop) (i32.const 1)))))
- ^^^^^^
-third_party/testsuite/labels.wast:259:18: expected module to be invalid
-(assert_invalid (module (func (result i32)
- ^^^^^^
-
-;;; STDERR ;;)
(;; STDOUT ;;;
assert_invalid error:
- third_party/testsuite/labels.wast:248:50: type mismatch of unary op. got void, expected f32
-...lid (module (func (block $l (f32.neg (br_if $l (i32.const 1))) (nop)))) "t...
- ^
+ third_party/testsuite/labels.wast:268:36: type mismatch of unary op. got void, expected f32
+ (module (func (block $l (f32.neg (br_if $l (i32.const 1))) (nop))))
+ ^
assert_invalid error:
- third_party/testsuite/labels.wast:250:54: type mismatch of block. got void, expected f32
-...(module (func (result f32) (block $l (br_if $l (f32.const 0) (i32.const 1)...
- ^
+ third_party/testsuite/labels.wast:272:40: type mismatch of block. got void, expected f32
+ (module (func (result f32) (block $l (br_if $l (f32.const 0) (i32.const 1)))))
+ ^
assert_invalid error:
- third_party/testsuite/labels.wast:251:54: type mismatch of block. got void, expected i32
-...(module (func (result i32) (block $l (br_if $l (f32.const 0) (i32.const 1)...
- ^
+ third_party/testsuite/labels.wast:276:40: type mismatch of block. got void, expected i32
+ (module (func (result i32) (block $l (br_if $l (f32.const 0) (i32.const 1)))))
+ ^
assert_invalid error:
- third_party/testsuite/labels.wast:251:64: type mismatch of br_if value. got f32, expected i32
-...unc (result i32) (block $l (br_if $l (f32.const 0) (i32.const 1))))) "type...
- ^
+ third_party/testsuite/labels.wast:276:50: type mismatch of br_if value. got f32, expected i32
+ (module (func (result i32) (block $l (br_if $l (f32.const 0) (i32.const 1)))))
+ ^
assert_invalid error:
- third_party/testsuite/labels.wast:252:50: type mismatch of unary op. got void, expected f32
-...lid (module (func (block $l (f32.neg (br_if $l (f32.const 0) (i32.const 1)...
- ^
+ third_party/testsuite/labels.wast:280:36: type mismatch of unary op. got void, expected f32
+ (module (func (block $l (f32.neg (br_if $l (f32.const 0) (i32.const 1))))))
+ ^
assert_invalid error:
- third_party/testsuite/labels.wast:253:66: type mismatch of block. got f32, expected i32
-...c (param i32) (result i32) (block $l (f32.neg (br_if $l (f32.const 0) (get...
- ^
+ third_party/testsuite/labels.wast:286:17: type mismatch of block. got f32, expected i32
+ (block $l (f32.neg (br_if $l (f32.const 0) (get_local 0))))
+ ^
assert_invalid error:
- third_party/testsuite/labels.wast:253:75: type mismatch of unary op. got void, expected f32
-...i32) (result i32) (block $l (f32.neg (br_if $l (f32.const 0) (get_local 0)...
- ^
+ third_party/testsuite/labels.wast:286:26: type mismatch of unary op. got void, expected f32
+ (block $l (f32.neg (br_if $l (f32.const 0) (get_local 0))))
+ ^
assert_invalid error:
- third_party/testsuite/labels.wast:253:85: type mismatch of br_if value. got f32, expected i32
-...lt i32) (block $l (f32.neg (br_if $l (f32.const 0) (get_local 0)))))) "typ...
- ^
+ third_party/testsuite/labels.wast:286:36: type mismatch of br_if value. got f32, expected i32
+ (block $l (f32.neg (br_if $l (f32.const 0) (get_local 0))))
+ ^
assert_invalid error:
- third_party/testsuite/labels.wast:255:32: type mismatch of block. got void, expected f32
- (block $l (f32.neg (block $i (br_if $l (f32.const 3) (get_local 0)))))))
- ^
+ third_party/testsuite/labels.wast:294:36: type mismatch of block. got void, expected f32
+ (block $l (f32.neg (block $i (br_if $l (f32.const 3) (get_local 0)))))
+ ^
+25/25 tests passed.
;;; STDOUT ;;)
diff --git a/test/interp/spec/left-to-right.txt b/test/interp/spec/left-to-right.txt
index 3aadce72..8ded6620 100644
--- a/test/interp/spec/left-to-right.txt
+++ b/test/interp/spec/left-to-right.txt
@@ -1,5 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/left-to-right.wast
(;; STDOUT ;;;
-93/93 tests passed.
+95/95 tests passed.
;;; STDOUT ;;)
diff --git a/test/parse/expr/current-memory.txt b/test/parse/expr/current-memory.txt
new file mode 100644
index 00000000..d47523e3
--- /dev/null
+++ b/test/parse/expr/current-memory.txt
@@ -0,0 +1,3 @@
+(module
+ (func
+ (current_memory)))
diff --git a/test/parse/expr/memory-size.txt b/test/parse/expr/memory-size.txt
deleted file mode 100644
index d180cc96..00000000
--- a/test/parse/expr/memory-size.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
- (func
- (memory_size)))
diff --git a/test/run-tests.py b/test/run-tests.py
index 6e61df1b..b39a3bb9 100755
--- a/test/run-tests.py
+++ b/test/run-tests.py
@@ -486,7 +486,7 @@ def HandleTestResult(status, info, result, rebase=False):
raise Error(stderr)
else:
if returncode != info.expected_error:
- # This test has already failed, but diff it anyway.
+#This test has already failed, but diff it anyway.
msg = 'expected error code %d, got %d.' % (info.expected_error,
returncode)
try:
@@ -544,6 +544,12 @@ def main(args):
pattern_re = '.*'
test_names = findtests.FindTestFiles(SCRIPT_DIR, '.txt', pattern_re)
+
+ # HACK(binji): disable the d8/spec tests for now, as there isn't yet a landed
+ # revision with binary_0xb support
+ test_names = [name for name in test_names
+ if not name.startswith(('d8','spec'))]
+
if options.list:
for test_name in test_names:
print test_name
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-07 19:49:35 +0000