From 75e9416f477cbd2c52e1ef929d324a368b094e38 Mon Sep 17 00:00:00 2001
From: Sergey Pepyakin <s.pepyakin@gmail.com>
Date: Fri, 9 Feb 2018 22:34:35 +0300
Subject: [PATCH] Use testsuite

---
 .gitmodules     |  6 +++---
 spec/Cargo.toml | 14 +-------------
 spec/build.rs   |  8 --------
 spec/src/run.rs |  2 +-
 spec/testsuite  |  1 +
 spec/wabt       |  1 -
 6 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 spec/build.rs
 create mode 160000 spec/testsuite
 delete mode 160000 spec/wabt

diff --git a/.gitmodules b/.gitmodules
index ed58662..186818e 100644
--- a/.gitmodules
+++ b/.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
diff --git a/spec/Cargo.toml b/spec/Cargo.toml
index d63b900..fc7fbbc 100644
--- a/spec/Cargo.toml
+++ b/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"
\ No newline at end of file
+wabt = "0.1.8"
diff --git a/spec/build.rs b/spec/build.rs
deleted file mode 100644
index 596e8a4..0000000
--- a/spec/build.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-extern crate cmake;
-use cmake::Config;
-
-fn main() {
-	let _dst = Config::new("wabt")
-		.define("BUILD_TESTS", "OFF")
-		.build();
-}
\ No newline at end of file
diff --git a/spec/src/run.rs b/spec/src/run.rs
index 1d60a37..1d9df25 100644
--- a/spec/src/run.rs
+++ b/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");
 }
diff --git a/spec/testsuite b/spec/testsuite
new file mode 160000
index 0000000..b38bf51
--- /dev/null
+++ b/spec/testsuite
@@ -0,0 +1 @@
+Subproject commit b38bf51ea9c956951b9466aa8243d9727d009bb2
diff --git a/spec/wabt b/spec/wabt
deleted file mode 160000
index a74072b..0000000
--- a/spec/wabt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a74072b2163ca20645e4a313636507cb3984f5fb