Refactored build outside src

.gitignore

@@ -1,3 +1,4 @@
 /target
 **/*.rs.bk
 /artifacts
+.DS_Store

Cargo.toml

@@ -7,7 +7,7 @@ repository = "https://github.com/wasmerio/wasmer"
 publish = true
 description = "High-Performance WebAssembly JIT interpreter"
 license = "MIT"
-build = "src/build_spectests.rs"
+build = "build/mod.rs"
 include = [
     "examples/**/*",
     "src/**/*",

build/mod.rs

@@ -0,0 +1,8 @@
+extern crate wabt;
+
+// use emtests;
+mod spectests;
+
+fn main() {
+    spectests::build();
+}

build/spectests.rs

@@ -1,8 +1,6 @@
 //! This file will run at build time to autogenerate Rust tests based on
 //! WebAssembly spec tests. It will convert the files indicated in TESTS
 //! from "/spectests/{MODULE}.wast" to "/src/spectests/{MODULE}.rs".
-extern crate wabt;
-
 use std::collections::HashMap;
 use std::env;
 use std::fs;
@@ -12,7 +10,7 @@ use wabt::wasm2wat;
 
 static ENV_VAR: &str = "WASM_GENERATE_SPECTESTS";
 
-static BANNER: &str = "// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+static BANNER: &str = "// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.\n";
 
 const TESTS: [&str; 60] = [
@@ -620,7 +618,7 @@ fn wast_to_rust(wast_filepath: &str) -> (String, i32) {
     (script_name, generator.command_no)
 }
 
-fn main() {
+pub fn build() {
     if env::var(ENV_VAR).unwrap_or("0".to_string()) != "1" {
         return;
     }

src/spectests/address.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/address.wast
 #![allow(

src/spectests/align.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/align.wast
 #![allow(

src/spectests/binary.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/binary.wast
 #![allow(

src/spectests/block.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/block.wast
 #![allow(

src/spectests/br.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/br.wast
 #![allow(

src/spectests/br_if.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/br_if.wast
 #![allow(

src/spectests/br_table.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/br_table.wast
 #![allow(

src/spectests/break_drop.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/break_drop.wast
 #![allow(

src/spectests/call.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/call.wast
 #![allow(

src/spectests/call_indirect.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/call_indirect.wast
 #![allow(

src/spectests/comments.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/comments.wast
 #![allow(

src/spectests/const_.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/const_.wast
 #![allow(

src/spectests/conversions.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/conversions.wast
 #![allow(

src/spectests/custom.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/custom.wast
 #![allow(

src/spectests/data.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/data.wast
 #![allow(

src/spectests/elem.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/elem.wast
 #![allow(

src/spectests/endianness.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/endianness.wast
 #![allow(

src/spectests/exports.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/exports.wast
 #![allow(

src/spectests/f32_.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f32_.wast
 #![allow(

src/spectests/f32_bitwise.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f32_bitwise.wast
 #![allow(

src/spectests/f32_cmp.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f32_cmp.wast
 #![allow(

src/spectests/f64_.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f64_.wast
 #![allow(

src/spectests/f64_bitwise.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f64_bitwise.wast
 #![allow(

src/spectests/f64_cmp.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f64_cmp.wast
 #![allow(

src/spectests/fac.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/fac.wast
 #![allow(

src/spectests/float_exprs.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/float_exprs.wast
 #![allow(

src/spectests/float_literals.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/float_literals.wast
 #![allow(

src/spectests/float_memory.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/float_memory.wast
 #![allow(

src/spectests/float_misc.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/float_misc.wast
 #![allow(

src/spectests/forward.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/forward.wast
 #![allow(

src/spectests/func.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/func.wast
 #![allow(

src/spectests/func_ptrs.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/func_ptrs.wast
 #![allow(

src/spectests/get_local.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/get_local.wast
 #![allow(

src/spectests/globals.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/globals.wast
 #![allow(

src/spectests/i32_.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/i32_.wast
 #![allow(

src/spectests/i64_.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/i64_.wast
 #![allow(

src/spectests/if_.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/if_.wast
 #![allow(

src/spectests/int_exprs.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/int_exprs.wast
 #![allow(

src/spectests/int_literals.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/int_literals.wast
 #![allow(

src/spectests/labels.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/labels.wast
 #![allow(

src/spectests/left_to_right.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/left_to_right.wast
 #![allow(

src/spectests/loop_.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/loop_.wast
 #![allow(

src/spectests/memory.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/memory.wast
 #![allow(

src/spectests/memory_grow.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/memory_grow.wast
 #![allow(

src/spectests/memory_redundancy.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/memory_redundancy.wast
 #![allow(

src/spectests/memory_trap.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/memory_trap.wast
 #![allow(

src/spectests/mod.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 
 // The _common module is not autogenerated, as it provides common functions for the spectests

src/spectests/nop.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/nop.wast
 #![allow(

src/spectests/return_.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/return_.wast
 #![allow(

src/spectests/select.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/select.wast
 #![allow(

src/spectests/set_local.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/set_local.wast
 #![allow(

src/spectests/stack.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/stack.wast
 #![allow(

src/spectests/start.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/start.wast
 #![allow(

src/spectests/store_retval.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/store_retval.wast
 #![allow(

src/spectests/switch.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/switch.wast
 #![allow(

src/spectests/tee_local.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/tee_local.wast
 #![allow(

src/spectests/token.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/token.wast
 #![allow(

src/spectests/traps.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/traps.wast
 #![allow(

src/spectests/typecheck.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/typecheck.wast
 #![allow(

src/spectests/types.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/types.wast
 #![allow(

src/spectests/unwind.rs

@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/unwind.wast
 #![allow(