3 files changed, 41 insertions, 41 deletions
diff --git a/test/spec/events.wast b/test/spec/events.wast
deleted file mode 100644
index c864a0c87..000000000
--- a/test/spec/events.wast
+++ /dev/null
@@ -1,33 +0,0 @@
-;; Test events
-
-(module
-  (event (attr 0) (param i32))
-  (event $e (attr 0) (param i32 f32))
-
-  (event $e-params0 (attr 0) (param i32 f32))
-  (event $e-params1 (attr 0) (param i32) (param f32))
-
-  (event $e-export (export "ex0") (attr 0) (param i32))
-  (event $e-import (import "env" "im0") (attr 0) (param i32))
-
-  (import "env" "im1" (event (attr 0) (param i32 f32)))
-  (export "ex1" (event $e))
-)
-
-(assert_invalid
-  (module (event $e (attr 0) (param i32) (result i32)))
-  "Event type's result type should be none"
-)
-
-(assert_invalid
-  (module (event $e (attr 1) (param i32)))
-  "Currently only attribute 0 is supported"
-)
-
-(assert_invalid
-  (module
-    (type $t (param i32))
-    (event $e (attr 0) (type $t) (param i32 f32))
-  )
-  "type and param don't match"
-)
diff --git a/test/spec/exception-handling.wast b/test/spec/exception-handling.wast
index 21dc98bd4..d09c21806 100644
--- a/test/spec/exception-handling.wast
+++ b/test/spec/exception-handling.wast
@@ -1,8 +1,8 @@
 (module
-  (event $e-v (attr 0))
-  (event $e-i32 (attr 0) (param i32))
-  (event $e-f32 (attr 0) (param f32))
-  (event $e-i32-f32 (attr 0) (param i32 f32))
+  (tag $e-v (attr 0))
+  (tag $e-i32 (attr 0) (param i32))
+  (tag $e-f32 (attr 0) (param f32))
+  (tag $e-i32-f32 (attr 0) (param i32 f32))
 
   (func $throw_single_value (export "throw_single_value")
     (throw $e-i32 (i32.const 5))
@@ -246,22 +246,22 @@
 
 (assert_invalid
   (module
-    (event $e-i32 (attr 0) (param i32))
+    (tag $e-i32 (attr 0) (param i32))
     (func $f0
       (throw $e-i32 (f32.const 0))
     )
   )
-  "event param types must match"
+  "tag param types must match"
 )
 
 (assert_invalid
   (module
-    (event $e-i32 (attr 0) (param i32 f32))
+    (tag $e-i32 (attr 0) (param i32 f32))
     (func $f0
       (throw $e-i32 (f32.const 0))
     )
   )
-  "event's param numbers must match"
+  "tag's param numbers must match"
 )
 
 (assert_invalid
diff --git a/test/spec/tags.wast b/test/spec/tags.wast
new file mode 100644
index 000000000..33e24e093
--- /dev/null
+++ b/test/spec/tags.wast
@@ -0,0 +1,33 @@
+;; Test tags
+
+(module
+  (tag (attr 0) (param i32))
+  (tag $e (attr 0) (param i32 f32))
+
+  (tag $e-params0 (attr 0) (param i32 f32))
+  (tag $e-params1 (attr 0) (param i32) (param f32))
+
+  (tag $e-export (export "ex0") (attr 0) (param i32))
+  (tag $e-import (import "env" "im0") (attr 0) (param i32))
+
+  (import "env" "im1" (tag (attr 0) (param i32 f32)))
+  (export "ex1" (tag $e))
+)
+
+(assert_invalid
+  (module (tag $e (attr 0) (param i32) (result i32)))
+  "Tag type's result type should be none"
+)
+
+(assert_invalid
+  (module (tag $e (attr 1) (param i32)))
+  "Currently only attribute 0 is supported"
+)
+
+(assert_invalid
+  (module
+    (type $t (param i32))
+    (tag $e (attr 0) (type $t) (param i32 f32))
+  )
+  "type and param don't match"
+)