From 546969a742496fd6d45305681c7b77e44976deeb Mon Sep 17 00:00:00 2001
From: Nick Lewycky <nick@wasmer.io>
Date: Fri, 2 Aug 2019 14:33:11 -0700
Subject: [PATCH] These tests are fixed too.

---
 lib/spectests/spectests/data.wast    | 66 +++++++++++++---------------
 lib/spectests/spectests/globals.wast |  6 +--
 2 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/lib/spectests/spectests/data.wast b/lib/spectests/spectests/data.wast
index 3573d2e6e..46b95436f 100644
--- a/lib/spectests/spectests/data.wast
+++ b/lib/spectests/spectests/data.wast
@@ -47,31 +47,27 @@
   (data (i32.const 1) "h")
 )
 
-;; SKIP_MUTABLE_GLOBALS
-;; (module
-;;   (global (import "spectest" "global_i32") i32)
-;;   (memory 1)
-;;   (data (get_global 0) "a")
-;; )
-;; SKIP_MUTABLE_GLOBALS
-;; (module
-;;   (global (import "spectest" "global_i32") i32)
-;;   (import "spectest" "memory" (memory 1))
-;;   (data (get_global 0) "a")
-;; )
+(module
+  (global (import "spectest" "global_i32") i32)
+  (memory 1)
+  (data (get_global 0) "a")
+)
+(module
+  (global (import "spectest" "global_i32") i32)
+  (import "spectest" "memory" (memory 1))
+  (data (get_global 0) "a")
+)
 
-;; SKIP_MUTABLE_GLOBALS
-;; (module
-;;   (global $g (import "spectest" "global_i32") i32)
-;;   (memory 1)
-;;   (data (get_global $g) "a")
-;; )
-;; SKIP_MUTABLE_GLOBALS
-;; (module
-;;   (global $g (import "spectest" "global_i32") i32)
-;;   (import "spectest" "memory" (memory 1))
-;;   (data (get_global $g) "a")
-;; )
+(module
+  (global $g (import "spectest" "global_i32") i32)
+  (memory 1)
+  (data (get_global $g) "a")
+)
+(module
+  (global $g (import "spectest" "global_i32") i32)
+  (import "spectest" "memory" (memory 1))
+  (data (get_global $g) "a")
+)
 
 ;; Use of internal globals in constant expressions is not allowed in MVP.
 ;; (module (memory 1) (data (get_global 0) "a") (global i32 (i32.const 0)))
@@ -138,19 +134,17 @@
   (data (i32.const 0) "a")
 )
 
-;; SKIP_MUTABLE_GLOBALS
-;; (module
-;;   (global (import "spectest" "global_i32") i32)
-;;   (import "spectest" "memory" (memory 0))
-;;   (data (get_global 0) "a")
-;; )
+(module
+  (global (import "spectest" "global_i32") i32)
+  (import "spectest" "memory" (memory 0))
+  (data (get_global 0) "a")
+)
 
-;; SKIP_MUTABLE_GLOBALS
-;; (module
-;;   (global (import "spectest" "global_i32") i32)
-;;   (import "spectest" "memory" (memory 0 3))
-;;   (data (get_global 0) "a")
-;; )
+(module
+  (global (import "spectest" "global_i32") i32)
+  (import "spectest" "memory" (memory 0 3))
+  (data (get_global 0) "a")
+)
 
 (module
   (import "spectest" "memory" (memory 0))
diff --git a/lib/spectests/spectests/globals.wast b/lib/spectests/spectests/globals.wast
index 1fbe72217..191933f59 100644
--- a/lib/spectests/spectests/globals.wast
+++ b/lib/spectests/spectests/globals.wast
@@ -246,11 +246,9 @@
 )
 
 ;; mutable globals can be exported
-;; SKIP_MUTABLE_GLOBALS
-;; (module (global (mut f32) (f32.const 0)) (export "a" (global 0)))
+(module (global (mut f32) (f32.const 0)) (export "a" (global 0)))
 
-;; SKIP_MUTABLE_GLOBALS
-;; (module (global (export "a") (mut f32) (f32.const 0)))
+(module (global (export "a") (mut f32) (f32.const 0)))
 
 (assert_invalid
   (module (global f32 (f32.neg (f32.const 0))))