From ee5b192d35918adf2b390fac558336955935b96a Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 2 Aug 2022 15:43:33 -0500
Subject: [PATCH] Re-enable component model `*.wast` tests (#4577)

* Re-enable component model `*.wast` tests

These accidentally stopped running as part of #4556 on CI since I forgot
one more location to touch a feature gate.

* Enable logging in component tests

This is a small convenience to get log messages during testing for
components by default.
---
 Cargo.toml                   | 1 +
 build.rs                     | 4 +---
 tests/all/component_model.rs | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e50cd24b4366..76484a280c85 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,6 +60,7 @@ wat = "1.0.47"
 once_cell = "1.9.0"
 rayon = "1.5.0"
 component-macro-test = { path = "crates/misc/component-macro-test" }
+wasmtime-wast = { path = "crates/wast", version = "=0.40.0", features = ['component-model'] }
 
 [target.'cfg(windows)'.dev-dependencies]
 windows-sys = { version = "0.36.0", features = ["Win32_System_Memory"] }
diff --git a/build.rs b/build.rs
index 18e4c80e7ca4..17ae15aa5476 100644
--- a/build.rs
+++ b/build.rs
@@ -28,9 +28,7 @@ fn main() -> anyhow::Result<()> {
             test_directory_module(out, "tests/misc_testsuite/simd", strategy)?;
             test_directory_module(out, "tests/misc_testsuite/threads", strategy)?;
             test_directory_module(out, "tests/misc_testsuite/memory64", strategy)?;
-            if cfg!(feature = "component-model") {
-                test_directory_module(out, "tests/misc_testsuite/component-model", strategy)?;
-            }
+            test_directory_module(out, "tests/misc_testsuite/component-model", strategy)?;
             Ok(())
         })?;
 
diff --git a/tests/all/component_model.rs b/tests/all/component_model.rs
index 4ebb3b612571..ada10f49c9f0 100644
--- a/tests/all/component_model.rs
+++ b/tests/all/component_model.rs
@@ -88,6 +88,8 @@ const REALLOC_AND_FREE: &str = r#"
 "#;
 
 fn engine() -> Engine {
+    drop(env_logger::try_init());
+
     let mut config = Config::new();
     config.wasm_component_model(true);