Make WASM tests happy

crates/analyzer/tests/analysis.rs

@@ -113,7 +113,7 @@ macro_rules! test_analysis_ingot {
                 "test_ingot",
                 IngotMode::Main,
                 FileKind::Local,
-                &tests::fixture_dir_files($path),
+                &test_files::new_fixture_dir_files($path),
                 indexmap! { "std".into() => std },
             );
 

crates/test-files/src/lib.rs

@@ -2,6 +2,8 @@ use include_dir::{include_dir, Dir};
 
 const FIXTURES: Dir = include_dir!("$CARGO_MANIFEST_DIR/fixtures");
 
+const NEW_FIXTURES: Dir = include_dir!("$CARGO_MANIFEST_DIR/../tests/fixtures");
+
 pub fn fixture(path: &str) -> &'static str {
     FIXTURES
         .get_file(path)
@@ -31,3 +33,12 @@ pub fn fixture_dir_files(path: &str) -> Vec<(&'static str, &'static str)> {
 
     fe_library::static_dir_files(dir)
 }
+
+/// Returns `(file_path, file_content)`
+pub fn new_fixture_dir_files(path: &str) -> Vec<(&'static str, &'static str)> {
+    let dir = NEW_FIXTURES
+        .get_dir(path)
+        .unwrap_or_else(|| panic!("no fixture dir named \"{path}\""));
+
+    fe_library::static_dir_files(dir)
+}

crates/tests/Cargo.toml

@@ -10,10 +10,8 @@ repository = "https://github.com/ethereum/fe"
 fe-test-runner = {path = "../test-runner", version = "^0.23.0"}
 fe-driver = {path = "../driver", version = "^0.23.0"}
 fe-common = {path = "../common", version = "^0.23.0"}
-fe-library = { path = "../library" }
 
 dir-test = "^0.1"
-include_dir = "0.7.2"
 
 [features]
 solc-backend = ["fe-driver/solc-backend"]

crates/tests/src/lib.rs

@@ -7,10 +7,6 @@ use fe_common::diagnostics::print_diagnostics;
 use fe_common::utils::files::load_fe_files_from_dir;
 use fe_test_runner::TestSink;
 
-use include_dir::{include_dir, Dir};
-
-const FIXTURES: Dir = include_dir!("$CARGO_MANIFEST_DIR/fixtures");
-
 #[dir_test(dir: "$CARGO_MANIFEST_DIR/fixtures/files", glob: "*.fe")]
 fn single_file_test_run(fixture: Fixture<&str>) {
     let mut db = fe_driver::Db::default();
@@ -77,12 +73,3 @@ fn ingot_test_run(fixture: Fixture<&str>) {
         }
     }
 }
-
-/// Returns `(file_path, file_content)`
-pub fn fixture_dir_files(path: &str) -> Vec<(&'static str, &'static str)> {
-    let dir = FIXTURES
-        .get_dir(path)
-        .unwrap_or_else(|| panic!("no fixture dir named \"{path}\""));
-
-    fe_library::static_dir_files(dir)
-}