Merge branch 'master' into fix/emscripten-translate

.gitattributes

@@ -1,2 +1,2 @@
 lib/emscripten/emtests/* linguist-vendored
-lib/runtime-core/spectests/* linguist-vendored
+lib/spectests/spectests/* linguist-vendored

Cargo.lock

@@ -738,12 +738,20 @@ dependencies = [
  "nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "page_size 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (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.1.2",
  "wasmparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wasmer-spectests"
+version = "0.1.2"
+dependencies = [
+ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-clif-backend 0.1.2",
+ "wasmer-runtime-core 0.1.2",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.22.1"

Cargo.toml

@@ -27,7 +27,7 @@ wasmer-runtime-core = { path = "lib/runtime-core" }
 wasmer-emscripten = { path = "lib/emscripten" }
 
 [workspace]
-members = ["lib/clif-backend", "lib/runtime", "lib/runtime-core", "lib/emscripten"]
+members = ["lib/clif-backend", "lib/runtime", "lib/runtime-core", "lib/emscripten", "lib/spectests"]
 
 [build-dependencies]
 wabt = "0.7.2"

Makefile

@@ -36,7 +36,7 @@ test:
 	# We use one thread so the emscripten stdouts doesn't collide
 	# cargo test --all -- --test-threads=1 $(runargs)
 	# cargo test --all --exclude wasmer-emscripten -- --test-threads=1 $(runargs)
-	cargo test -p wasmer-runtime-core -- --test-threads=1 $(runargs)
+	cargo test -p wasmer-spectests -- --test-threads=1 $(runargs)
 
 release:
 	# If you are in OS-X, you will need mingw-w64 for cross compiling to windows

lib/runtime-core/Cargo.toml

@@ -6,7 +6,6 @@ license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
 repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"
-build = "build/mod.rs"
 
 [dependencies]
 hashbrown = "0.1"
@@ -22,17 +21,10 @@ winapi = { version = "0.3", features = ["memoryapi"] }
 [target.'cfg(unix)'.dependencies]
 errno = "0.2.4"
 
-[build-dependencies]
-wabt = "0.7.2"
-
 [dev-dependencies]
 wasmer-clif-backend = { path = "../clif-backend", version = "0.1.2" }
-wabt = "0.7.2"
 field-offset = "0.1.1"
 
 [features]
-default = ["fast-tests"]
-
 debug = []
-# This feature will allow cargo test to compile much faster
+
-fast-tests = []

lib/spectests/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "wasmer-spectests"
+version = "0.1.2"
+description = "Wasmer spectests library"
+license = "MIT"
+authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
+repository = "https://github.com/wasmerio/wasmer"
+edition = "2018"
+build = "build/mod.rs"
+
+[dependencies]
+wasmer-runtime-core = { path = "../runtime-core" }
+
+[build-dependencies]
+wabt = "0.7.2"
+
+[dev-dependencies]
+wasmer-clif-backend = { path = "../clif-backend", version = "0.1.2" }
+wabt = "0.7.2"
+
+[features]
+default = ["fast-tests"]
+fast-tests = []