15 files changed, 22 insertions, 22 deletions
diff --git a/test/ctor-eval/bad-indirect-call.wast b/test/ctor-eval/bad-indirect-call.wast
index 29a09fe2e..9ef091ad3 100644
--- a/test/ctor-eval/bad-indirect-call.wast
+++ b/test/ctor-eval/bad-indirect-call.wast
@@ -4,7 +4,7 @@
   (data (i32.const 10) "waka waka waka waka waka")
   (table 1 1 funcref)
   (elem (i32.const 0) $call-indirect)
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (func $test1
     (call_indirect (type $v) (i32.const 1)) ;; unsafe to call, out of range
     (i32.store8 (i32.const 20) (i32.const 120))
diff --git a/test/ctor-eval/bad-indirect-call2.wast b/test/ctor-eval/bad-indirect-call2.wast
index 8999af145..60d73b7fc 100644
--- a/test/ctor-eval/bad-indirect-call2.wast
+++ b/test/ctor-eval/bad-indirect-call2.wast
@@ -5,7 +5,7 @@
   (import "env" "_abort" (func $_abort))
   (table 2 2 funcref)
   (elem (i32.const 0) $_abort $call-indirect)
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (func $test1
     (call_indirect (type $v) (i32.const 0)) ;; unsafe to call, imported
     (i32.store8 (i32.const 20) (i32.const 120))
diff --git a/test/ctor-eval/basics-flatten.wast b/test/ctor-eval/basics-flatten.wast
index 3584bc9fa..f53b772f0 100644
--- a/test/ctor-eval/basics-flatten.wast
+++ b/test/ctor-eval/basics-flatten.wast
@@ -7,9 +7,9 @@
   (data (i32.const 20) "waka waka waka")
   (table 1 1 funcref)
   (elem (i32.const 0) $call-indirect)
-  (export "test1" $test1)
-  (export "test2" $test2)
-  (export "test3" $test3)
+  (export "test1" (func $test1))
+  (export "test2" (func $test2))
+  (export "test3" (func $test3))
   (func $test1
     (drop (i32.const 0)) ;; no work at all, really
     (call $safe-to-call) ;; safe to call
diff --git a/test/ctor-eval/basics.wast b/test/ctor-eval/basics.wast
index 5f9add08f..ff138de24 100644
--- a/test/ctor-eval/basics.wast
+++ b/test/ctor-eval/basics.wast
@@ -4,9 +4,9 @@
   (data (i32.const 10) "waka waka waka waka waka")
   (table 1 1 funcref)
   (elem (i32.const 0) $call-indirect)
-  (export "test1" $test1)
-  (export "test2" $test2)
-  (export "test3" $test3)
+  (export "test1" (func $test1))
+  (export "test2" (func $test2))
+  (export "test3" (func $test3))
   (func $test1
     (drop (i32.const 0)) ;; no work at all, really
     (call $safe-to-call) ;; safe to call
diff --git a/test/ctor-eval/imported-global.wast b/test/ctor-eval/imported-global.wast
index 20e56d2d1..1c14a3114 100644
--- a/test/ctor-eval/imported-global.wast
+++ b/test/ctor-eval/imported-global.wast
@@ -3,7 +3,7 @@
   (data (i32.const 10) "waka waka waka waka waka")
   ;; imports must not be used
   (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (global $mine (mut i32) (global.get $tempDoublePtr)) ;; BAD, if used
   (func $test1
     (i32.store8 (i32.const 13) (i32.const 115)) ;; we never get here.
diff --git a/test/ctor-eval/indirect-call3.wast b/test/ctor-eval/indirect-call3.wast
index 9c88e0f78..0c18c01d5 100644
--- a/test/ctor-eval/indirect-call3.wast
+++ b/test/ctor-eval/indirect-call3.wast
@@ -5,7 +5,7 @@
   (import "env" "_abort" (func $_abort))
   (table 2 2 funcref)
   (elem (i32.const 0) $_abort $call-indirect)
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (func $test1
     (call_indirect (type $v) (i32.const 1)) ;; safe to call
     (i32.store8 (i32.const 20) (i32.const 120))
diff --git a/test/ctor-eval/just_some.wast b/test/ctor-eval/just_some.wast
index 64aa18d27..661688eff 100644
--- a/test/ctor-eval/just_some.wast
+++ b/test/ctor-eval/just_some.wast
@@ -1,9 +1,9 @@
 (module
   (memory 256 256)
   (data (i32.const 10) "waka waka waka waka waka")
-  (export "test1" $test1)
-  (export "test2" $test2)
-  (export "test3" $test3)
+  (export "test1" (func $test1))
+  (export "test2" (func $test2))
+  (export "test3" (func $test3))
   (func $test1
     (i32.store8 (i32.const 12) (i32.const 115)) ;; a safe store, should alter memory
   )
diff --git a/test/ctor-eval/partial-locals-tee.wast b/test/ctor-eval/partial-locals-tee.wast
index 37dac176a..651234790 100644
--- a/test/ctor-eval/partial-locals-tee.wast
+++ b/test/ctor-eval/partial-locals-tee.wast
@@ -4,7 +4,7 @@
   (memory 256 256)
   (data (i32.const 10) "_________________")
 
-  (export "test1" $test1)
+  (export "test1" (func $test1))
 
   (func $test1
     (local $temp i32)
diff --git a/test/ctor-eval/partial-locals.wast b/test/ctor-eval/partial-locals.wast
index b0304c2ea..4a58274c8 100644
--- a/test/ctor-eval/partial-locals.wast
+++ b/test/ctor-eval/partial-locals.wast
@@ -4,7 +4,7 @@
   (memory 256 256)
   (data (i32.const 10) "_________________")
 
-  (export "test1" $test1)
+  (export "test1" (func $test1))
 
   (global $sp (mut i32) (i32.const 100))
 
diff --git a/test/ctor-eval/partial-return.wast b/test/ctor-eval/partial-return.wast
index e74c59cb8..95529ea17 100644
--- a/test/ctor-eval/partial-return.wast
+++ b/test/ctor-eval/partial-return.wast
@@ -4,7 +4,7 @@
   (memory 256 256)
   (data (i32.const 10) "_________________")
 
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (export "memory" (memory $0))
 
   (func $test1
diff --git a/test/ctor-eval/partial.wast b/test/ctor-eval/partial.wast
index bbff880e7..e1d033bda 100644
--- a/test/ctor-eval/partial.wast
+++ b/test/ctor-eval/partial.wast
@@ -4,12 +4,12 @@
   (memory 256 256)
   (data (i32.const 10) "_________________")
 
-  (export "test1" $test1)
+  (export "test1" (func $test1))
 
   ;; Use the function in an additional export. We should still get the same
   ;; results if we call this one, so it should point to identical contents as
   ;; earlier
-  (export "keepalive" $test1)
+  (export "keepalive" (func $test1))
 
   (func $test1
     ;; A safe store, should alter memory
diff --git a/test/ctor-eval/unsafe_call.wast b/test/ctor-eval/unsafe_call.wast
index a3dff7c19..86543cbf4 100644
--- a/test/ctor-eval/unsafe_call.wast
+++ b/test/ctor-eval/unsafe_call.wast
@@ -1,7 +1,7 @@
 (module
   (memory 256 256)
   (data (i32.const 10) "waka waka waka waka waka")
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (func $test1
     (call $unsafe-to-call) ;; unsafe to call
     (i32.store (i32.const 12) (i32.const 115)) ;; a safe store, should alter memory
diff --git a/test/ctor-eval/unsafe_store.wast b/test/ctor-eval/unsafe_store.wast
index 296363b35..9b0111806 100644
--- a/test/ctor-eval/unsafe_store.wast
+++ b/test/ctor-eval/unsafe_store.wast
@@ -1,7 +1,7 @@
 (module
   (memory 256 256)
   (data (i32.const 10) "waka waka waka waka waka")
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (func $test1
     (i32.store8 (i32.const 9) (i32.const 109)) ;; before first segment
   )
diff --git a/test/ctor-eval/unsafe_store2.wast b/test/ctor-eval/unsafe_store2.wast
index 5272c8333..7c25eee67 100644
--- a/test/ctor-eval/unsafe_store2.wast
+++ b/test/ctor-eval/unsafe_store2.wast
@@ -1,7 +1,7 @@
 (module
   (memory 256 256)
   (data (i32.const 10) "waka waka waka waka waka")
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (func $test1
     (i32.store8 (i32.const 34) (i32.const 109)) ;; after last segment
   )
diff --git a/test/ctor-eval/unsafe_store3.wast b/test/ctor-eval/unsafe_store3.wast
index b8e7c662a..64e7a28c4 100644
--- a/test/ctor-eval/unsafe_store3.wast
+++ b/test/ctor-eval/unsafe_store3.wast
@@ -1,7 +1,7 @@
 (module
   (memory 256 256)
   (data (i32.const 10) "waka waka waka waka waka")
-  (export "test1" $test1)
+  (export "test1" (func $test1))
   (func $test1
     (i32.store16 (i32.const 33) (i32.const 109)) ;; after last segment due to size of type
   )