Use wat over wast for text format filenames (#2518)

51 files changed, 15 insertions, 212 deletions

diff --git a/test/hello_world.wast b/test/hello_world.wat
index 8efc9e227..8efc9e227 100644
--- a/test/hello_world.wast
+++ b/test/hello_world.wat
diff --git a/test/lld/duplicate_imports.wast b/test/lld/duplicate_imports.wat
index db184bcad..db184bcad 100644
--- a/test/lld/duplicate_imports.wast
+++ b/test/lld/duplicate_imports.wat
diff --git a/test/lld/duplicate_imports.wast.out b/test/lld/duplicate_imports.wat.out
index 323365711..323365711 100644
--- a/test/lld/duplicate_imports.wast.out
+++ b/test/lld/duplicate_imports.wat.out
diff --git a/test/lld/em_asm.wast b/test/lld/em_asm.wat
index 84250b6ac..84250b6ac 100644
--- a/test/lld/em_asm.wast
+++ b/test/lld/em_asm.wat
diff --git a/test/lld/em_asm.wast.out b/test/lld/em_asm.wat.out
index c66cdc1cc..c66cdc1cc 100644
--- a/test/lld/em_asm.wast.out
+++ b/test/lld/em_asm.wat.out
diff --git a/test/lld/em_asm_O0.wast b/test/lld/em_asm_O0.wat
index 10511ca67..10511ca67 100644
--- a/test/lld/em_asm_O0.wast
+++ b/test/lld/em_asm_O0.wat
diff --git a/test/lld/em_asm_O0.wast.out b/test/lld/em_asm_O0.wat.out
index 692b3fe6e..692b3fe6e 100644
--- a/test/lld/em_asm_O0.wast.out
+++ b/test/lld/em_asm_O0.wat.out
diff --git a/test/lld/em_asm_main_thread.wast b/test/lld/em_asm_main_thread.wat
index 93735c7a9..0435e9be0 100644
--- a/test/lld/em_asm_main_thread.wast
+++ b/test/lld/em_asm_main_thread.wat
@@ -1,4 +1,4 @@
-(; Copied from em_asm.wast
+(; Copied from em_asm.wat
   s/emscripten_asm_const_int/emscripten_asm_const_int_sync_on_main_thread/g
 ;)
 (module
diff --git a/test/lld/em_asm_main_thread.wast.out b/test/lld/em_asm_main_thread.wat.out
index 2020b172e..2020b172e 100644
--- a/test/lld/em_asm_main_thread.wast.out
+++ b/test/lld/em_asm_main_thread.wat.out
diff --git a/test/lld/em_asm_shared.wast b/test/lld/em_asm_shared.wat
index ba70886ec..ba70886ec 100644
--- a/test/lld/em_asm_shared.wast
+++ b/test/lld/em_asm_shared.wat
diff --git a/test/lld/em_asm_shared.wast.out b/test/lld/em_asm_shared.wat.out
index f3b676f24..f3b676f24 100644
--- a/test/lld/em_asm_shared.wast.out
+++ b/test/lld/em_asm_shared.wat.out
diff --git a/test/lld/em_asm_table.wast b/test/lld/em_asm_table.wat
index c35ebe577..c35ebe577 100644
--- a/test/lld/em_asm_table.wast
+++ b/test/lld/em_asm_table.wat
diff --git a/test/lld/em_asm_table.wast.out b/test/lld/em_asm_table.wat.out
index 48d02d208..48d02d208 100644
--- a/test/lld/em_asm_table.wast.out
+++ b/test/lld/em_asm_table.wat.out
diff --git a/test/lld/em_js_O0.wast b/test/lld/em_js_O0.wat
index 6d64c5b61..6d64c5b61 100644
--- a/test/lld/em_js_O0.wast
+++ b/test/lld/em_js_O0.wat
diff --git a/test/lld/em_js_O0.wast.out b/test/lld/em_js_O0.wat.out
index 6e141975d..6e141975d 100644
--- a/test/lld/em_js_O0.wast.out
+++ b/test/lld/em_js_O0.wat.out
diff --git a/test/lld/hello_world.passive.wast b/test/lld/hello_world.passive.wat
index 27ccb8f90..27ccb8f90 100644
--- a/test/lld/hello_world.passive.wast
+++ b/test/lld/hello_world.passive.wat
diff --git a/test/lld/hello_world.passive.wast.out b/test/lld/hello_world.passive.wat.out
index 6c9fd4ef7..6c9fd4ef7 100644
--- a/test/lld/hello_world.passive.wast.out
+++ b/test/lld/hello_world.passive.wat.out
diff --git a/test/lld/hello_world.wast b/test/lld/hello_world.wat
index f4b32d0fe..f4b32d0fe 100644
--- a/test/lld/hello_world.wast
+++ b/test/lld/hello_world.wat
diff --git a/test/lld/hello_world.wast.out b/test/lld/hello_world.wat.out
index 55bc3a89a..55bc3a89a 100644
--- a/test/lld/hello_world.wast.out
+++ b/test/lld/hello_world.wat.out
diff --git a/test/lld/init.wast b/test/lld/init.wat
index fe3e5b7b2..fe3e5b7b2 100644
--- a/test/lld/init.wast
+++ b/test/lld/init.wat
diff --git a/test/lld/init.wast.out b/test/lld/init.wat.out
index 52eb0dd51..52eb0dd51 100644
--- a/test/lld/init.wast.out
+++ b/test/lld/init.wat.out
diff --git a/test/lld/recursive.wast b/test/lld/recursive.wat
index cd6a4ae86..cd6a4ae86 100644
--- a/test/lld/recursive.wast
+++ b/test/lld/recursive.wat
diff --git a/test/lld/recursive.wast.out b/test/lld/recursive.wat.out
index af4caef45..af4caef45 100644
--- a/test/lld/recursive.wast.out
+++ b/test/lld/recursive.wat.out
diff --git a/test/lld/recursive_safe_stack.wast b/test/lld/recursive_safe_stack.wat
index 67f7f3914..67f7f3914 100644
--- a/test/lld/recursive_safe_stack.wast
+++ b/test/lld/recursive_safe_stack.wat
diff --git a/test/lld/recursive_safe_stack.wast.out b/test/lld/recursive_safe_stack.wat.out
index 7253a28fb..7253a28fb 100644
--- a/test/lld/recursive_safe_stack.wast.out
+++ b/test/lld/recursive_safe_stack.wat.out
diff --git a/test/lld/reserved_func_ptr.wast b/test/lld/reserved_func_ptr.wat
index f979bd2d8..f979bd2d8 100644
--- a/test/lld/reserved_func_ptr.wast
+++ b/test/lld/reserved_func_ptr.wat
diff --git a/test/lld/reserved_func_ptr.wast.out b/test/lld/reserved_func_ptr.wat.out
index fd0d1f4af..fd0d1f4af 100644
--- a/test/lld/reserved_func_ptr.wast.out
+++ b/test/lld/reserved_func_ptr.wat.out
diff --git a/test/lld/shared.wast b/test/lld/shared.wat
index 99b667e42..99b667e42 100644
--- a/test/lld/shared.wast
+++ b/test/lld/shared.wat
diff --git a/test/lld/shared.wast.out b/test/lld/shared.wat.out
index d27672f3a..d27672f3a 100644
--- a/test/lld/shared.wast.out
+++ b/test/lld/shared.wat.out
diff --git a/test/lld/shared_longjmp.wast b/test/lld/shared_longjmp.wat
index 235e1fadf..235e1fadf 100644
--- a/test/lld/shared_longjmp.wast
+++ b/test/lld/shared_longjmp.wat
diff --git a/test/lld/shared_longjmp.wast.out b/test/lld/shared_longjmp.wat.out
index c6bdf1c17..c6bdf1c17 100644
--- a/test/lld/shared_longjmp.wast.out
+++ b/test/lld/shared_longjmp.wat.out
diff --git a/test/lld/standalone-wasm-with-start.wast b/test/lld/standalone-wasm-with-start.wat
index 8767c8efb..8767c8efb 100644
--- a/test/lld/standalone-wasm-with-start.wast
+++ b/test/lld/standalone-wasm-with-start.wat
diff --git a/test/lld/standalone-wasm-with-start.wast.out b/test/lld/standalone-wasm-with-start.wat.out
index 424d2f85e..424d2f85e 100644
--- a/test/lld/standalone-wasm-with-start.wast.out
+++ b/test/lld/standalone-wasm-with-start.wat.out
diff --git a/test/lld/standalone-wasm.wast b/test/lld/standalone-wasm.wat
index 2ccbf3f29..2ccbf3f29 100644
--- a/test/lld/standalone-wasm.wast
+++ b/test/lld/standalone-wasm.wat
diff --git a/test/lld/standalone-wasm.wast.out b/test/lld/standalone-wasm.wat.out
index 5e9fa4c91..5e9fa4c91 100644
--- a/test/lld/standalone-wasm.wast.out
+++ b/test/lld/standalone-wasm.wat.out
diff --git a/test/lld/standalone-wasm2.wast b/test/lld/standalone-wasm2.wat
index f4c7843b6..f4c7843b6 100644
--- a/test/lld/standalone-wasm2.wast
+++ b/test/lld/standalone-wasm2.wat
diff --git a/test/lld/standalone-wasm2.wast.out b/test/lld/standalone-wasm2.wat.out
index fe669b414..fe669b414 100644
--- a/test/lld/standalone-wasm2.wast.out
+++ b/test/lld/standalone-wasm2.wat.out
diff --git a/test/lld/standalone-wasm3.wast b/test/lld/standalone-wasm3.wat
index 45c0bed35..45c0bed35 100644
--- a/test/lld/standalone-wasm3.wast
+++ b/test/lld/standalone-wasm3.wat
diff --git a/test/lld/standalone-wasm3.wast.out b/test/lld/standalone-wasm3.wat.out
index a334d96e4..a334d96e4 100644
--- a/test/lld/standalone-wasm3.wast.out
+++ b/test/lld/standalone-wasm3.wat.out
diff --git a/test/s2wasm_known_binaryen_shell_test_failures.txt b/test/s2wasm_known_binaryen_shell_test_failures.txt
deleted file mode 100644
index 52d495a5d..000000000
--- a/test/s2wasm_known_binaryen_shell_test_failures.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-# [trap final > memory]
-20010915-1.c.s.wast
-20020413-1.c.s.wast
-20021120-3.c.s.wast
-20030221-1.c.s.wast
-20031012-1.c.s.wast
-20041214-1.c.s.wast
-20050502-1.c.s.wast
-20050502-2.c.s.wast
-20070201-1.c.s.wast
-20071030-1.c.s.wast
-20080502-1.c.s.wast
-20121108-1.c.s.wast
-920501-8.c.s.wast
-920501-9.c.s.wast
-920726-1.c.s.wast
-930513-1.c.s.wast
-980605-1.c.s.wast
-990513-1.c.s.wast
-bitfld-5.c.s.wast
-memcpy-1.c.s.wast
-multi-ix.c.s.wast
-pr37573.c.s.wast
-pr43236.c.s.wast
-pr44852.c.s.wast
-pr51933.c.s.wast
-pr54471.c.s.wast
-pr56205.c.s.wast
-pr56866.c.s.wast
-pr56982.c.s.wast
-pr57130.c.s.wast
-stdarg-1.c.s.wast
-stdarg-2.c.s.wast
-string-opt-17.c.s.wast
-struct-ret-1.c.s.wast
-va-arg-2.c.s.wast
-va-arg-5.c.s.wast
-va-arg-6.c.s.wast
-va-arg-9.c.s.wast
-
-# [trap offset > memory]
-complex-7.c.s.wast
-
-# abort called: the tests are self-validating and call abort when they detect a
-# failure.  This may not be binaryen's fault (the toolchain may be emitting bad
-# code) but it could be binaryen's fault.
-920625-1.c.s.wast
-931004-10.c.s.wast
-931004-12.c.s.wast
-931004-14.c.s.wast
-931004-6.c.s.wast
-bitfld-3.c.s.wast
-eeprof-1.c.s.wast
-pr32244-1.c.s.wast
-pr34971.c.s.wast
-pr38151.c.s.wast
-pr44575.c.s.wast
-stdarg-3.c.s.wast
-strct-stdarg-1.c.s.wast
-strct-varg-1.c.s.wast
-va-arg-pack-1.c.s.wast
-
-# callImport: the toolchain needs to properly use libc and a runtime. These
-# aren't binaryen's fault.
-20000910-2.c.s.wast # strchr
-20000914-1.c.s.wast # malloc
-20011024-1.c.s.wast # strcmp
-20020406-1.c.s.wast # malloc
-20021011-1.c.s.wast # strcmp
-20031204-1.c.s.wast # strcmp
-20050218-1.c.s.wast # strlen
-20050826-1.c.s.wast # memset
-20051113-1.c.s.wast # malloc
-20071018-1.c.s.wast # __builtin_malloc
-20071120-1.c.s.wast # __builtin_malloc
-20071202-1.c.s.wast # memcpy
-20081218-1.c.s.wast # memset
-20101011-1.c.s.wast # signal
-921117-1.c.s.wast # strcmp
-941014-2.c.s.wast # malloc
-960215-1.c.s.wast # __addtf3
-960405-1.c.s.wast # __eqtf2
-960521-1.c.s.wast # malloc
-980506-3.c.s.wast # memset
-980707-1.c.s.wast # strcmp
-980709-1.c.s.wast # pow
-990628-1.c.s.wast # malloc
-991112-1.c.s.wast # isprint
-align-2.c.s.wast # __eqtf2
-builtin-bitops-1.c.s.wast # __builtin_clrsb
-complex-5.c.s.wast # __divsc3
-ipa-sra-2.c.s.wast # calloc
-loop-2f.c.s.wast # open
-loop-2g.c.s.wast # open
-memcpy-2.c.s.wast # memset
-memcpy-bi.c.s.wast # memcpy
-memset-1.c.s.wast # memset
-memset-3.c.s.wast # memset
-pr33870-1.c.s.wast # memset
-pr33870.c.s.wast # memset
-pr34456.c.s.wast # qsort
-pr36038.c.s.wast # memcpy
-pr36765.c.s.wast # __builtin_malloc
-pr39228.c.s.wast # __builtin_isinff
-pr41395-1.c.s.wast # malloc
-pr41395-2.c.s.wast # malloc
-pr41463.c.s.wast # malloc
-pr43008.c.s.wast # __builtin_malloc
-pr43784.c.s.wast # memcpy
-pr47237.c.s.wast # __builtin_apply_args
-pr47337.c.s.wast # strcmp
-pr49218.c.s.wast # __fixsfti
-pr53688.c.s.wast # memset
-pr58419.c.s.wast # getpid
-pr59229.c.s.wast # memcpy
-printf-1.c.s.wast # isprint
-printf-chk-1.c.s.wast # vprintf
-regstack-1.c.s.wast # __addtf3
-strcmp-1.c.s.wast # strcmp
-strcpy-1.c.s.wast # memset
-string-opt-5.c.s.wast # strlen
-strlen-1.c.s.wast # strlen
-strncmp-1.c.s.wast # strcmp
-va-arg-10.c.s.wast # strlen
-va-arg-22.c.s.wast # memcpy
-va-arg-21.c.s.wast # malloc
-vprintf-chk-1.c.s.wast # vprintf
-vprintf-1.c.s.wast # vprintf
-fprintf-1.c.s.wast # stdout
-fprintf-chk-1.c.s.wast # stdout
-vfprintf-1.c.s.wast # stdout
-vfprintf-chk-1.c.s.wast # stdout
-
-# Untriaged
-20000112-1.c.s.wast O0
-20001011-1.c.s.wast O0
-20010409-1.c.s.wast O0
-20010605-2.c.s.wast O0
-20010925-1.c.s.wast O0
-20011008-3.c.s.wast O0
-20011121-1.c.s.wast O0
-20021127-1.c.s.wast O0
-20030626-1.c.s.wast O0
-20030626-2.c.s.wast O0
-20030715-1.c.s.wast O0
-20030914-1.c.s.wast O0
-20030914-2.c.s.wast O0
-20031003-1.c.s.wast O0
-20040208-1.c.s.wast O0
-20040223-1.c.s.wast O0
-20040313-1.c.s.wast O0
-20040709-1.c.s.wast O0
-20040709-2.c.s.wast O0
-20041126-1.c.s.wast O0
-20050121-1.c.s.wast O0
-20090113-1.c.s.wast O0
-20111208-1.c.s.wast O0
-20120207-1.c.s.wast O0
-920810-1.c.s.wast O0
-921006-1.c.s.wast O0
-930622-2.c.s.wast O0
-930725-1.c.s.wast O0
-950426-1.c.s.wast O0
-960327-1.c.s.wast O0
-960513-1.c.s.wast O0
-complex-6.c.s.wast O0
-conversion.c.s.wast O0
-mode-dependent-address.c.s.wast O0
-nestfunc-4.c.s.wast O0
-p18298.c.s.wast O0
-pr15262-1.c.s.wast O0
-pr20621-1.c.s.wast O0
-pr22061-1.c.s.wast O0
-pr23135.c.s.wast O0
-pr30778.c.s.wast O0
-pr33142.c.s.wast O0
-pr36321.c.s.wast O0
-pr42614.c.s.wast O0
-pr49644.c.s.wast O0
-pr60062.c.s.wast O0
-string-opt-18.c.s.wast O0
-vla-dealloc-1.c.s.wast O0
-
-20030914-1.c.s.wast O2
-20040409-1.c.s.wast O2
-20040409-2.c.s.wast O2
-20040409-3.c.s.wast O2
-20060412-1.c.s.wast O2
-20100708-1.c.s.wast O2
-920612-1.c.s.wast O2
-920711-1.c.s.wast O2
-930529-1.c.s.wast O2
-bcp-1.c.s.wast O2
-builtin-constant.c.s.wast O2
-pr22493-1.c.s.wast O2
-# pr28982b.c.s.wast O2
-pr36093.c.s.wast O2
diff --git a/test/unit.wast b/test/unit.wat
index 6d15b26d1..6d15b26d1 100644
--- a/test/unit.wast
+++ b/test/unit.wat
diff --git a/test/unit/input/asyncify-coroutine.wast b/test/unit/input/asyncify-coroutine.wat
index ace97c6e6..ace97c6e6 100644
--- a/test/unit/input/asyncify-coroutine.wast
+++ b/test/unit/input/asyncify-coroutine.wat
diff --git a/test/unit/input/asyncify-pure.wast b/test/unit/input/asyncify-pure.wat
index 961ab9442..961ab9442 100644
--- a/test/unit/input/asyncify-pure.wast
+++ b/test/unit/input/asyncify-pure.wat
diff --git a/test/unit/input/asyncify-sleep.wast b/test/unit/input/asyncify-sleep.wat
index 91fb5a327..91fb5a327 100644
--- a/test/unit/input/asyncify-sleep.wast
+++ b/test/unit/input/asyncify-sleep.wat
diff --git a/test/unit/input/asyncify-stackOverflow.wast b/test/unit/input/asyncify-stackOverflow.wat
index a36a06b40..a36a06b40 100644
--- a/test/unit/input/asyncify-stackOverflow.wast
+++ b/test/unit/input/asyncify-stackOverflow.wat
diff --git a/test/unit/input/em_asm_mangled_string.wast b/test/unit/input/em_asm_mangled_string.wat
index aa856270d..aa856270d 100644
--- a/test/unit/input/em_asm_mangled_string.wast
+++ b/test/unit/input/em_asm_mangled_string.wat
diff --git a/test/unit/input/stack_ir.wast b/test/unit/input/stack_ir.wat
index 0d5d0dfc3..0d5d0dfc3 100644
--- a/test/unit/input/stack_ir.wast
+++ b/test/unit/input/stack_ir.wat
diff --git a/test/unit/test_asyncify.py b/test/unit/test_asyncify.py
index 800f86ed7..356a4935a 100644
--- a/test/unit/test_asyncify.py
+++ b/test/unit/test_asyncify.py
@@ -10,9 +10,9 @@ class AsyncifyTest(utils.BinaryenTestCase):
     def test_asyncify_js(self):
         def test(args):
             print(args)
-            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-sleep.wast'), '--asyncify', '-o', 'a.wasm'])
-            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-coroutine.wast'), '--asyncify', '-o', 'b.wasm'])
-            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-stackOverflow.wast'), '--asyncify', '-o', 'c.wasm'])
+            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-sleep.wat'), '--asyncify', '-o', 'a.wasm'])
+            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-coroutine.wat'), '--asyncify', '-o', 'b.wasm'])
+            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-stackOverflow.wat'), '--asyncify', '-o', 'c.wasm'])
             print('  file size: %d' % os.path.getsize('a.wasm'))
             shared.run_process([shared.NODEJS, self.input_path('asyncify.js')])
 
@@ -24,9 +24,9 @@ class AsyncifyTest(utils.BinaryenTestCase):
         test(['-Os', '-g'])
 
     def test_asyncify_pure_wasm(self):
-        shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '--asyncify', '-o', 'a.wasm'])
-        shared.run_process(shared.WASM_DIS + ['a.wasm', '-o', 'a.wast'])
-        output = shared.run_process(shared.WASM_SHELL + ['a.wast'], capture_output=True).stdout
+        shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '--asyncify', '-o', 'a.wasm'])
+        shared.run_process(shared.WASM_DIS + ['a.wasm', '-o', 'a.wat'])
+        output = shared.run_process(shared.WASM_SHELL + ['a.wat'], capture_output=True).stdout
         with open(self.input_path('asyncify-pure.txt'), 'r') as f:
             self.assertEqual(f.read(), output)
 
@@ -45,7 +45,7 @@ class AsyncifyTest(utils.BinaryenTestCase):
             ('--pass-arg=asyncify-whitelist@DOS_ReadFile(unsigned short, unsigned char*, unsigned short*, bool)', None),
         ]:
             print(arg, warning)
-            err = shared.run_process(shared.WASM_OPT + ['-q', self.input_path('asyncify-pure.wast'), '--asyncify', arg], stdout=subprocess.PIPE, stderr=subprocess.PIPE).stderr.strip()
+            err = shared.run_process(shared.WASM_OPT + ['-q', self.input_path('asyncify-pure.wat'), '--asyncify', arg], stdout=subprocess.PIPE, stderr=subprocess.PIPE).stderr.strip()
             if warning:
                 self.assertIn('warning', err)
                 self.assertIn(warning, err)
@@ -53,13 +53,13 @@ class AsyncifyTest(utils.BinaryenTestCase):
                 self.assertNotIn('warning', err)
 
     def test_asyncify_blacklist_and_whitelist(self):
-        proc = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '--asyncify', '--pass-arg=asyncify-whitelist@main', '--pass-arg=asyncify-blacklist@main'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=False)
+        proc = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '--asyncify', '--pass-arg=asyncify-whitelist@main', '--pass-arg=asyncify-blacklist@main'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=False)
         self.assertNotEqual(proc.returncode, 0, 'must error on using both lists at once')
         self.assertIn('It makes no sense to use both a blacklist and a whitelist with asyncify', proc.stdout)
 
     def test_asyncify_imports(self):
         def test(args):
-            return shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-sleep.wast'), '--asyncify', '--print'] + args, stdout=subprocess.PIPE).stdout
+            return shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-sleep.wat'), '--asyncify', '--print'] + args, stdout=subprocess.PIPE).stdout
 
         normal = test(['--pass-arg=asyncify-imports@env.sleep'])
         temp = tempfile.NamedTemporaryFile().name
diff --git a/test/unit/test_finalize.py b/test/unit/test_finalize.py
index 9a5c3c750..ff4eebd9c 100644
--- a/test/unit/test_finalize.py
+++ b/test/unit/test_finalize.py
@@ -8,7 +8,7 @@ class EmscriptenFinalizeTest(utils.BinaryenTestCase):
     def test_em_asm_mangled_string(self):
         input_dir = os.path.dirname(__file__)
         p = shared.run_process(shared.WASM_EMSCRIPTEN_FINALIZE + [
-            os.path.join(input_dir, 'input', 'em_asm_mangled_string.wast'), '-o', os.devnull, '--global-base=1024'
+            os.path.join(input_dir, 'input', 'em_asm_mangled_string.wat'), '-o', os.devnull, '--global-base=1024'
         ], check=False, capture_output=True)
         self.assertNotEqual(p.returncode, 0)
         self.assertIn('Fatal: local.get of unknown in arg0 of call to emscripten_asm_const_int (used by EM_ASM* macros) in function main.', p.stderr)
diff --git a/test/unit/test_stack_ir.py b/test/unit/test_stack_ir.py
index 1fcab88d8..78086d0cc 100644
--- a/test/unit/test_stack_ir.py
+++ b/test/unit/test_stack_ir.py
@@ -6,7 +6,7 @@ from . import utils
 class StackIRTest(utils.BinaryenTestCase):
     # test that stack IR opts make a difference.
     def test_stack_ir_opts(self):
-        path = self.input_path('stack_ir.wast')
+        path = self.input_path('stack_ir.wat')
         opt = shared.run_process(shared.WASM_OPT + [path, '-O', '--generate-stack-ir', '--optimize-stack-ir', '--print-stack-ir', '-o', 'a.wasm'], capture_output=True).stdout
         nonopt = shared.run_process(shared.WASM_OPT + [path, '-O', '--generate-stack-ir', '--print-stack-ir', '-o', 'b.wasm'], capture_output=True).stdout
         # see a difference in the printed stack IR (the optimizations let us
diff --git a/test/unit/test_warnings.py b/test/unit/test_warnings.py
index 0717ae823..05fc11099 100644
--- a/test/unit/test_warnings.py
+++ b/test/unit/test_warnings.py
@@ -6,13 +6,13 @@ from . import utils
 
 class WarningsText(utils.BinaryenTestCase):
     def test_warn_on_no_passes(self):
-        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '-o', 'a.wasm'], stderr=subprocess.PIPE).stderr
+        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '-o', 'a.wasm'], stderr=subprocess.PIPE).stderr
         self.assertIn('warning: no passes specified, not doing any work', err)
 
     def test_warn_on_no_output(self):
-        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '-O1'], stderr=subprocess.PIPE).stderr
+        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '-O1'], stderr=subprocess.PIPE).stderr
         self.assertIn('warning: no output file specified, not emitting output', err)
 
     def test_quiet_suppresses_warnings(self):
-        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '-q'], stderr=subprocess.PIPE).stderr
+        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '-q'], stderr=subprocess.PIPE).stderr
         self.assertNotIn('warning', err)