Rename run args (WebAssembly#728)

As suggested in WebAssembly#725 (comment).

test/README.md

@@ -100,9 +100,9 @@ argument to the executable (which by default is `out/wat2wasm`).
 The currently supported list of keys:
 
 - `TOOL`: a set of preconfigured keys, see below.
-- `EXE`: the executable to run, defaults to out/wat2wasm
+- `RUN`: the executable to run, defaults to out/wat2wasm
 - `STDIN_FILE`: the file to use for STDIN instead of the contents of this file.
-- `FLAGS`: additional flags to pass to the executable
+- `ARGS`: additional args to pass to the executable
 - `ENV`: environment variables to set, separated by spaces
 - `ERROR`: the expected return value from the executable, defaults to 0
 - `SLOW`: if defined, this test's timeout is doubled.

test/binary/bad-logging-basic.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-gen-wasm-interp
-;;; FLAGS: -v
+;;; ARGS: -v
 ;;; ERROR: 1
 magic
 version

test/binary/bad-opcode-prefix.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-gen-wasm
-;;; FLAGS: --objdump
+;;; ARGS: --objdump
 ;;; ERROR: 1
 magic
 version

test/binary/bad-opcode.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-gen-wasm
-;;; FLAGS: --objdump
+;;; ARGS: --objdump
 ;;; ERROR: 1
 magic
 version

test/binary/linking-section.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-gen-wasm
-;;; FLAGS: --objdump
+;;; ARGS: --objdump
 magic
 version
 section("linking") {

test/binary/no-names.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-gen-wasm
-;;; FLAGS: --no-debug-names
+;;; ARGS: --no-debug-names
 magic
 version
 section(TYPE) { count[1] function params[0] results[1] i32 }

test/binary/user-section.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-gen-wasm
-;;; FLAGS: -v
+;;; ARGS: -v
 magic
 version
 section("foo") { count[4] }

test/desugar/fold-catch.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: wat-desugar
-;;; FLAGS: --enable-exceptions --fold-expr
+;;; ARGS: --enable-exceptions --fold-expr
 (module
   (except $ex i32)
   (func (result i32)

test/desugar/fold-export-throw.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: wat-desugar
-;;; FLAGS: --enable-exceptions --fold-exprs
+;;; ARGS: --enable-exceptions --fold-exprs
 (module
   (except $ex i32)
   (export "except" (except $ex))

test/desugar/fold-try-as-argument.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: wat-desugar
-;;; FLAGS: --enable-exceptions --fold-expr
+;;; ARGS: --enable-exceptions --fold-expr
 (module
   (except $ex i32)
   (func (result i32)

test/desugar/fold-try.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: wat-desugar
-;;; FLAGS: --enable-exceptions --fold-expr
+;;; ARGS: --enable-exceptions --fold-expr
 (module
   (except $ex i32)
   (func (result i32)

test/desugar/try-exports.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: wat-desugar
-;;; FLAGS: --enable-exceptions
+;;; ARGS: --enable-exceptions
 (module
   (except $ex i32)
   (export "except" (except $ex))

test/desugar/try-import.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: wat-desugar
-;;; FLAGS: --enable-exceptions
+;;; ARGS: --enable-exceptions
 (module
   (import "c++" "except" (except $ex i32))
   (func (result i32)

test/desugar/try.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: wat-desugar
-;;; FLAGS: --enable-exceptions
+;;; ARGS: --enable-exceptions
 (module
   (except $ex i32)
   (func (result i32)

test/dump/atomic.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: --enable-threads
+;;; ARGS: --enable-threads
 
 (module
   (memory 1 1 shared)

test/dump/bad-version-logging.txt

@@ -1,6 +1,6 @@
 ;;; ERROR: 1
 ;;; TOOL: run-objdump
-;;; FLAGS: --gen-wasm --dump-debug
+;;; ARGS: --gen-wasm --dump-debug
 magic
 0xe 0 0 0
 (;; STDERR ;;;

test/dump/bad-version.txt

@@ -1,6 +1,6 @@
 ;;; ERROR: 1
 ;;; TOOL: run-objdump
-;;; FLAGS: --gen-wasm
+;;; ARGS: --gen-wasm
 magic
 0xe 0 0 0
 (;; STDERR ;;;

test/dump/basic.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v --headers
+;;; ARGS: -v --headers
 (module
   (memory 1)
   (func $f (param i32 i32) (result i32)

test/dump/binary.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     i32.const 0

test/dump/block-257-exprs-br.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     block $foo

test/dump/block-257-exprs.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     block

test/dump/block.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     block

test/dump/br-block-named.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     block $outer           ;; 3

test/dump/br-block.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func                     ;; depth
     block $outer           ;; 4

test/dump/br-loop-inner-expr.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func (result i32)
     block $exit (result i32)

test/dump/br-loop-inner.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     (block $exit (loop $cont

test/dump/br-loop.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     loop $cont

test/dump/brif-loop.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     loop $cont

test/dump/brif.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     block $foo

test/dump/brtable-empty.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     block

test/dump/brtable.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     block

test/dump/call.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func (param i32)
      i32.const 1

test/dump/callimport.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (import "foo" "bar" (func (param i32 f32) (result i32)))
   (func (result i32)

test/dump/callindirect.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (type $t (func (param i32)))
   (func $f (type $t)

test/dump/cast.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     i32.const 0

test/dump/compare.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     i32.const 0

test/dump/const.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     i32.const 0

test/dump/convert-sat.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v --enable-saturating-float-to-int
+;;; ARGS: -v --enable-saturating-float-to-int
 (module
   (func
     f32.const 0

test/dump/convert.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     i32.const 0

test/dump/current-memory.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (memory 1)
   (func (result i32)

test/dump/debug-import-names.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: --headers -v --debug-names --dump-verbose
+;;; ARGS: --headers -v --debug-names --dump-verbose
 (module
   (import "bar" "foo" (func $foo)))
 (;; STDOUT ;;;

test/dump/debug-names.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v --debug-names --dump-verbose
+;;; ARGS: -v --debug-names --dump-verbose
 (module
   (func $F1 (param $F1P0 i32)
     (local $F1L1 f32)

test/dump/dedupe-sig.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (type (func (param i32) (result i64)))
   (import "foo" "bar" (func (param i32) (result i64)))

test/dump/drop.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     i32.const 0

test/dump/export-multi.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func (nop))
   (export "a" (func 0))

test/dump/expr-br.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func (result i32)
     block (result i32)

test/dump/expr-brif.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func (result i32)
     block $exit (result i32)

test/dump/func-exported.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func)
   (export "foo" (func 0)))

test/dump/func-multi.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func)
   (func)

test/dump/func-named.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func $my-func))
 (;; STDOUT ;;;

test/dump/getglobal.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (global i32 (i32.const 0))
   (func (result i32)

test/dump/getlocal-param.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func (param i32 f32)
     (local i64 f32 i32 f32)

test/dump/getlocal.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     (local f64 f32 i64 i32 i32 f32 f64 i64)

test/dump/global.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v --dump-verbose
+;;; ARGS: -v --dump-verbose
 (module
   (import "foo" "i32_global" (global i32))
   (import "foo" "i64_global" (global i64))

test/dump/grow-memory.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (memory 1 2)
   (func (param i32)

test/dump/hexfloat_f32.txt

@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; FLAGS: -v
+;;; ARGS: -v
 (module
   (func
     f32.const 0x0p0