fix emscripten dependencies by making separate test crate

CHANGELOG.md

@@ -5,6 +5,8 @@ All PRs to the Wasmer repository must add to this file.
 Blocks of changes will separated by version increments.
 
 ## **[Unreleased]**
+- [#541](https://github.com/wasmerio/wasmer/pull/541) Fix dependency graph by making separate test crates; ABI implementations should not depend on compilers
+
 ## 0.5.4
 - [#536](https://github.com/wasmerio/wasmer/pull/536) Update cache to use compiler backend name in cache key
 - [#529](https://github.com/wasmerio/wasmer/pull/529) Updates the Wasm Interface library, which is used by wapm, with bug fixes and error message improvements

Cargo.lock

@@ -1425,6 +1425,7 @@ dependencies = [
  "wasmer-clif-backend 0.5.4",
  "wasmer-dev-utils 0.5.4",
  "wasmer-emscripten 0.5.4",
+ "wasmer-emscripten-tests 0.5.4",
  "wasmer-kernel-loader 0.1.0",
  "wasmer-llvm-backend 0.5.4",
  "wasmer-middleware-common 0.5.4",
@@ -1472,15 +1473,23 @@ name = "wasmer-emscripten"
 version = "0.5.4"
 dependencies = [
  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-runtime-core 0.5.4",
+]
+
+[[package]]
+name = "wasmer-emscripten-tests"
+version = "0.5.4"
+dependencies = [
+ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmer-clif-backend 0.5.4",
  "wasmer-dev-utils 0.5.4",
+ "wasmer-emscripten 0.5.4",
  "wasmer-llvm-backend 0.5.4",
  "wasmer-runtime-core 0.5.4",
  "wasmer-singlepass-backend 0.5.4",

Cargo.toml

@@ -36,6 +36,7 @@ wasmer-wasi = { path = "lib/wasi", optional = true }
 wasmer-kernel-loader = { path = "lib/kernel-loader", optional = true }
 wasmer-dev-utils = { path = "lib/dev-utils", optional = true }
 wasmer-wasi-tests = { path = "lib/wasi-tests", optional = true }
+wasmer-emscripten-tests = { path = "lib/emscripten-tests", optional = true }
 
 [workspace]
 members = [
@@ -55,6 +56,7 @@ members = [
     "lib/kernel-net",
     "lib/dev-utils",
     "lib/wasi-tests",
+    "lib/emscripten-tests",
     "examples/plugin-for-example"
 ]
 

Makefile

@@ -5,7 +5,7 @@ generate-spectests:
 	WASMER_RUNTIME_GENERATE_SPECTESTS=1 cargo build -p wasmer-runtime-core --release
 
 generate-emtests:
-	WASM_EMSCRIPTEN_GENERATE_EMTESTS=1 cargo build -p wasmer-emscripten --release
+	WASM_EMSCRIPTEN_GENERATE_EMTESTS=1 cargo build -p wasmer-emscripten-tests --release
 
 generate-wasitests:
 	WASM_WASI_GENERATE_WASITESTS=1 cargo build -p wasmer-wasi-tests --release
@@ -28,13 +28,13 @@ spectests: spectests-singlepass spectests-cranelift spectests-llvm
 
 # Emscripten tests
 emtests-singlepass:
-	cargo test --manifest-path lib/emscripten/Cargo.toml --release --features singlepass -- --test-threads=1
+	cargo test --manifest-path lib/emscripten-tests/Cargo.toml --release --features singlepass -- --test-threads=1
 
 emtests-cranelift:
-	cargo test --manifest-path lib/emscripten/Cargo.toml --release --features clif -- --test-threads=1
+	cargo test --manifest-path lib/emscripten-tests/Cargo.toml --release --features clif -- --test-threads=1
 
 emtests-llvm:
-	cargo test --manifest-path lib/emscripten/Cargo.toml --release --features llvm -- --test-threads=1
+	cargo test --manifest-path lib/emscripten-tests/Cargo.toml --release --features llvm -- --test-threads=1
 
 emtests: emtests-singlepass emtests-cranelift emtests-llvm
 
@@ -83,7 +83,7 @@ capi:
 	cargo test -p wasmer-runtime-c-api --release
 
 test-rest: capi
-	cargo test --release --all --exclude wasmer-runtime-c-api --exclude wasmer-emscripten --exclude wasmer-spectests --exclude wasmer-wasi --exclude wasmer-middleware-common --exclude wasmer-singlepass-backend --exclude wasmer-clif-backend --exclude wasmer-llvm-backend --exclude wasmer-wasi-tests
+	cargo test --release --all --exclude wasmer-runtime-c-api --exclude wasmer-emscripten --exclude wasmer-spectests --exclude wasmer-wasi --exclude wasmer-middleware-common --exclude wasmer-singlepass-backend --exclude wasmer-clif-backend --exclude wasmer-llvm-backend --exclude wasmer-wasi-tests --exclude wasmer-emscripten-tests
 
 circleci-clean:
 	@if [ ! -z "${CIRCLE_JOB}" ]; then rm -f /home/circleci/project/target/debug/deps/libcranelift_wasm* && rm -f /Users/distiller/project/target/debug/deps/libcranelift_wasm*; fi;
@@ -147,4 +147,4 @@ publish-release:
 # cargo install cargo-deps
 # must install graphviz for `dot`
 dep-graph:
-	cargo deps --optional-deps --filter wasmer-wasi wasmer-wasi-tests wasmer-kernel-loader wasmer-dev-utils wasmer-llvm-backend wasmer-emscripten wasmer-runtime-core wasmer-runtime wasmer-middleware-common wasmer-singlepass-backend wasmer-clif-backend wasmer --manifest-path Cargo.toml | dot -Tpng > wasmer_depgraph.png
+	cargo deps --optional-deps --filter wasmer-wasi wasmer-wasi-tests wasmer-kernel-loader wasmer-dev-utils wasmer-llvm-backend wasmer-emscripten wasmer-emscripten-tests wasmer-runtime-core wasmer-runtime wasmer-middleware-common wasmer-singlepass-backend wasmer-clif-backend wasmer --manifest-path Cargo.toml | dot -Tpng > wasmer_depgraph.png

lib/emscripten-tests/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "wasmer-emscripten-tests"
+version = "0.5.4"
+description = "Tests for our Emscripten implementation"
+license = "MIT"
+authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
+edition = "2018"
+publish = false
+build = "build/mod.rs"
+
+[dependencies]
+wasmer-emscripten = { path = "../emscripten", version = "0.5.4" }
+wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" }
+wasmer-clif-backend = { path = "../clif-backend", version = "0.5.4" }
+wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.4", optional = true }
+wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.4", optional = true }
+
+[dev-dependencies]
+wabt = "0.7.2"
+wasmer-dev-utils = { path = "../dev-utils", version = "0.5.4"}
+
+[build-dependencies]
+glob = "0.2.11"
+
+[features]
+clif = []
+llvm = ["wasmer-llvm-backend"]
+singlepass = ["wasmer-singlepass-backend"]
+debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"]