From 2ce945771ed950d0128d87605aa5d50dba7a23ef Mon Sep 17 00:00:00 2001 From: Brendan Hansknecht Date: Sun, 7 Nov 2021 18:01:40 -0800 Subject: [PATCH] Make test crates only have dev dependencies and separate out wasm memory helper --- compiler/test_dev/Cargo.toml | 2 +- compiler/test_gen/Cargo.toml | 7 ++----- compiler/test_gen/src/helpers/eval.rs | 2 +- compiler/test_wasm/Cargo.toml | 3 ++- compiler/test_wasm/src/helpers/eval.rs | 2 +- compiler/test_wasm/src/helpers/mod.rs | 1 - .../test_wasm/src/helpers/wasm32_test_result.rs | 2 +- compiler/test_wasm_util/Cargo.toml | 13 +++++++++++++ .../src}/from_wasm32_memory.rs | 0 compiler/test_wasm_util/src/lib.rs | 1 + 10 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 compiler/test_wasm_util/Cargo.toml rename compiler/{test_wasm/src/helpers => test_wasm_util/src}/from_wasm32_memory.rs (100%) create mode 100644 compiler/test_wasm_util/src/lib.rs diff --git a/compiler/test_dev/Cargo.toml b/compiler/test_dev/Cargo.toml index f10de8f9dc..4a6690a4bd 100644 --- a/compiler/test_dev/Cargo.toml +++ b/compiler/test_dev/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" name = "test_dev" path = "src/tests.rs" -[dependencies] +[dev-dependencies] roc_collections = { path = "../collections" } roc_can = { path = "../can" } roc_build = { path = "../build" } diff --git a/compiler/test_gen/Cargo.toml b/compiler/test_gen/Cargo.toml index 2ff5966cd5..739b1247b5 100644 --- a/compiler/test_gen/Cargo.toml +++ b/compiler/test_gen/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" name = "test_gen" path = "src/tests.rs" -[dependencies] +[dev-dependencies] roc_gen_llvm = { path = "../gen_llvm" } roc_collections = { path = "../collections" } roc_region = { path = "../region" } @@ -27,7 +27,7 @@ roc_can = { path = "../can" } roc_parse = { path = "../parse" } roc_build = { path = "../build" } roc_std = { path = "../../roc_std" } -test_wasm = { path = "../test_wasm" } +test_wasm_util = { path = "../test_wasm_util" } im = "15.0.0" im-rc = "15.0.0" bumpalo = { version = "3.8.0", features = ["collections"] } @@ -39,9 +39,6 @@ libloading = "0.7.1" wasmer = { version = "2.0.0", default-features = false, features = ["default-cranelift", "default-universal"] } wasmer-wasi = "2.0.0" tempfile = "3.2.0" - -[dev-dependencies] -bumpalo = { version = "3.8.0", features = ["collections"] } indoc = "1.0.3" [features] diff --git a/compiler/test_gen/src/helpers/eval.rs b/compiler/test_gen/src/helpers/eval.rs index e0202673e8..ac0fefc0fb 100644 --- a/compiler/test_gen/src/helpers/eval.rs +++ b/compiler/test_gen/src/helpers/eval.rs @@ -10,7 +10,7 @@ use roc_module::symbol::Symbol; use roc_mono::ir::OptLevel; use roc_types::subs::VarStore; use target_lexicon::Triple; -use test_wasm::helpers::from_wasm32_memory::FromWasm32Memory; +use test_wasm_util::from_wasm32_memory::FromWasm32Memory; fn promote_expr_to_module(src: &str) -> String { let mut buffer = String::from("app \"test\" provides [ main ] to \"./platform\"\n\nmain =\n"); diff --git a/compiler/test_wasm/Cargo.toml b/compiler/test_wasm/Cargo.toml index 4e9b48fd26..c053f529d5 100644 --- a/compiler/test_wasm/Cargo.toml +++ b/compiler/test_wasm/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" name = "test_wasm" path = "src/tests.rs" -[dependencies] +[dev-dependencies] # roc_module = { path = "../module" } # roc_mono = { path = "../mono" } @@ -24,6 +24,7 @@ roc_builtins = { path = "../builtins" } roc_load = { path = "../load" } roc_types = { path = "../types" } roc_module = { path = "../module" } +test_wasm_util = { path = "../test_wasm_util" } indoc = "1.0.3" libc = "0.2.106" target-lexicon = "0.12.2" diff --git a/compiler/test_wasm/src/helpers/eval.rs b/compiler/test_wasm/src/helpers/eval.rs index 791b01c6e5..d87339b2d4 100644 --- a/compiler/test_wasm/src/helpers/eval.rs +++ b/compiler/test_wasm/src/helpers/eval.rs @@ -2,10 +2,10 @@ use std::cell::Cell; use std::collections::hash_map::DefaultHasher; use std::hash::{Hash, Hasher}; -use crate::helpers::from_wasm32_memory::FromWasm32Memory; use crate::helpers::wasm32_test_result::Wasm32TestResult; use roc_can::builtins::builtin_defs_map; use roc_collections::all::{MutMap, MutSet}; +use test_wasm_util::from_wasm32_memory::FromWasm32Memory; const TEST_WRAPPER_NAME: &str = "test_wrapper"; diff --git a/compiler/test_wasm/src/helpers/mod.rs b/compiler/test_wasm/src/helpers/mod.rs index 4771adc413..5627bb930a 100644 --- a/compiler/test_wasm/src/helpers/mod.rs +++ b/compiler/test_wasm/src/helpers/mod.rs @@ -1,6 +1,5 @@ #[macro_use] pub mod eval; -pub mod from_wasm32_memory; pub mod wasm32_test_result; /// Used in the with_larger_debug_stack() function, for tests that otherwise diff --git a/compiler/test_wasm/src/helpers/wasm32_test_result.rs b/compiler/test_wasm/src/helpers/wasm32_test_result.rs index e5b43fdbda..a8626770f5 100644 --- a/compiler/test_wasm/src/helpers/wasm32_test_result.rs +++ b/compiler/test_wasm/src/helpers/wasm32_test_result.rs @@ -1,11 +1,11 @@ use bumpalo::collections::Vec; -use crate::helpers::from_wasm32_memory::FromWasm32Memory; use roc_gen_wasm::wasm_module::opcodes; use roc_gen_wasm::wasm_module::{ Align, CodeBuilder, Export, ExportType, LocalId, Signature, ValueType, WasmModule, }; use roc_std::{RocDec, RocList, RocOrder, RocStr}; +use test_wasm_util::from_wasm32_memory::FromWasm32Memory; pub trait Wasm32TestResult { fn insert_test_wrapper<'a>( diff --git a/compiler/test_wasm_util/Cargo.toml b/compiler/test_wasm_util/Cargo.toml new file mode 100644 index 0000000000..bdb3ebf83b --- /dev/null +++ b/compiler/test_wasm_util/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "test_wasm_util" +version = "0.1.0" +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[dependencies] +# roc_module = { path = "../module" } +# roc_mono = { path = "../mono" } + +wasmer = { version = "2.0.0", default-features = false, features = ["default-cranelift", "default-universal"] } + +roc_std = { path = "../../roc_std" } diff --git a/compiler/test_wasm/src/helpers/from_wasm32_memory.rs b/compiler/test_wasm_util/src/from_wasm32_memory.rs similarity index 100% rename from compiler/test_wasm/src/helpers/from_wasm32_memory.rs rename to compiler/test_wasm_util/src/from_wasm32_memory.rs diff --git a/compiler/test_wasm_util/src/lib.rs b/compiler/test_wasm_util/src/lib.rs new file mode 100644 index 0000000000..5055c92fa7 --- /dev/null +++ b/compiler/test_wasm_util/src/lib.rs @@ -0,0 +1 @@ +pub mod from_wasm32_memory; \ No newline at end of file