Use testsuite

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "spec/wabt"]
-	path = spec/wabt
-	url = https://github.com/WebAssembly/wabt.git
+[submodule "spec/testsuite"]
+	path = spec/testsuite
+	url = https://github.com/webassembly/testsuite

spec/Cargo.toml

@@ -7,19 +7,7 @@ readme = "README.md"
 repository = "https://github.com/nikvolf/parity-wasm"
 homepage = "https://github.com/nikvolf/parity-wasm"
 description = "parity-wasm testsuite"
-build = "build.rs"
-
-[build-dependencies]
-cmake = "0.1"
 
 [dependencies]
 wasmi = { path = ".." }
-serde_json = "1.0"
-serde_derive = "1.0"
-serde = "1.0"
-
-[dev-dependencies]
-wasmi = { path = ".." }
-serde_json = "1.0"
-serde_derive = "1.0"
-serde = "1.0"
+wabt = "0.1.8"

spec/build.rs

@@ -1,8 +0,0 @@
-extern crate cmake;
-use cmake::Config;
-
-fn main() {
-	let _dst = Config::new("wabt")
-		.define("BUILD_TESTS", "OFF")
-		.build();
-}

spec/src/run.rs

@@ -496,6 +496,6 @@ pub fn spec(name: &str) {
 	let mut spec_runner = SpecRunner {
 		spec_driver: SpecDriver::new(),
 	};
-	let spec_script_path = format!("./wabt/third_party/testsuite/{}.wast", name);
+	let spec_script_path = format!("testsuite/{}.wast", name);
 	run_spec(spec_script_path, &mut spec_runner).expect("success");
 }

spec/testsuite

@@ -0,0 +1 @@
+Subproject commit b38bf51ea9c956951b9466aa8243d9727d009bb2

spec/wabt

@@ -1 +0,0 @@
-Subproject commit a74072b2163ca20645e4a313636507cb3984f5fb