From 3d62fc88ca27ba989176d131f34e0c3f678c8fc7 Mon Sep 17 00:00:00 2001 From: Brandon Fish Date: Tue, 29 Jan 2019 16:58:16 -0600 Subject: [PATCH 1/2] Move spectests to their own library --- Cargo.lock | 10 +++++++- Cargo.toml | 2 +- Makefile | 2 +- lib/runtime-core/Cargo.toml | 10 +------- lib/spectests/Cargo.toml | 23 ++++++++++++++++++ lib/{runtime-core => spectests}/build/mod.rs | 0 .../build/spectests.rs | 0 .../examples/simple/main.rs | 0 .../examples/simple/simple.wasm | Bin .../examples/test.rs | 0 .../spectests/README.md | 0 .../spectests/address.wast | 0 .../spectests/align.wast | 0 .../spectests/binary.wast | 0 .../spectests/block.wast | 0 .../spectests/br.wast | 0 .../spectests/br_if.wast | 0 .../spectests/br_table.wast | 0 .../spectests/break_drop.wast | 0 .../spectests/call.wast | 0 .../spectests/call_indirect.wast | 0 .../spectests/comments.wast | 0 .../spectests/const_.wast | 0 .../spectests/conversions.wast | 0 .../spectests/custom.wast | 0 .../spectests/data.wast | 0 .../spectests/elem.wast | 0 .../spectests/endianness.wast | 0 .../spectests/exports.wast | 0 .../spectests/f32_.wast | 0 .../spectests/f32_bitwise.wast | 0 .../spectests/f32_cmp.wast | 0 .../spectests/f64_.wast | 0 .../spectests/f64_bitwise.wast | 0 .../spectests/f64_cmp.wast | 0 .../spectests/fac.wast | 0 .../spectests/float_exprs.wast | 0 .../spectests/float_literals.wast | 0 .../spectests/float_memory.wast | 0 .../spectests/float_misc.wast | 0 .../spectests/forward.wast | 0 .../spectests/func.wast | 0 .../spectests/func_ptrs.wast | 0 .../spectests/get_local.wast | 0 .../spectests/globals.wast | 0 .../spectests/i32_.wast | 0 .../spectests/i64_.wast | 0 .../spectests/if_.wast | 0 .../spectests/int_exprs.wast | 0 .../spectests/int_literals.wast | 0 .../spectests/labels.wast | 0 .../spectests/left_to_right.wast | 0 .../spectests/loop_.wast | 0 .../spectests/memory.wast | 0 .../spectests/memory_grow.wast | 0 .../spectests/memory_redundancy.wast | 0 .../spectests/memory_trap.wast | 0 .../spectests/nop.wast | 0 .../spectests/return_.wast | 0 .../spectests/select.wast | 0 .../spectests/set_local.wast | 0 .../spectests/stack.wast | 0 .../spectests/start.wast | 0 .../spectests/store_retval.wast | 0 .../spectests/switch.wast | 0 .../spectests/tee_local.wast | 0 .../spectests/token.wast | 0 .../spectests/traps.wast | 0 .../spectests/typecheck.wast | 0 .../spectests/types.wast | 0 .../spectests/unwind.wast | 0 .../tests/semantics.rs | 0 .../tests/spectest.rs | 0 73 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 lib/spectests/Cargo.toml rename lib/{runtime-core => spectests}/build/mod.rs (100%) rename lib/{runtime-core => spectests}/build/spectests.rs (100%) rename lib/{runtime-core => spectests}/examples/simple/main.rs (100%) rename lib/{runtime-core => spectests}/examples/simple/simple.wasm (100%) rename lib/{runtime-core => spectests}/examples/test.rs (100%) rename lib/{runtime-core => spectests}/spectests/README.md (100%) rename lib/{runtime-core => spectests}/spectests/address.wast (100%) rename lib/{runtime-core => spectests}/spectests/align.wast (100%) rename lib/{runtime-core => spectests}/spectests/binary.wast (100%) rename lib/{runtime-core => spectests}/spectests/block.wast (100%) rename lib/{runtime-core => spectests}/spectests/br.wast (100%) rename lib/{runtime-core => spectests}/spectests/br_if.wast (100%) rename lib/{runtime-core => spectests}/spectests/br_table.wast (100%) rename lib/{runtime-core => spectests}/spectests/break_drop.wast (100%) rename lib/{runtime-core => spectests}/spectests/call.wast (100%) rename lib/{runtime-core => spectests}/spectests/call_indirect.wast (100%) rename lib/{runtime-core => spectests}/spectests/comments.wast (100%) rename lib/{runtime-core => spectests}/spectests/const_.wast (100%) rename lib/{runtime-core => spectests}/spectests/conversions.wast (100%) rename lib/{runtime-core => spectests}/spectests/custom.wast (100%) rename lib/{runtime-core => spectests}/spectests/data.wast (100%) rename lib/{runtime-core => spectests}/spectests/elem.wast (100%) rename lib/{runtime-core => spectests}/spectests/endianness.wast (100%) rename lib/{runtime-core => spectests}/spectests/exports.wast (100%) rename lib/{runtime-core => spectests}/spectests/f32_.wast (100%) rename lib/{runtime-core => spectests}/spectests/f32_bitwise.wast (100%) rename lib/{runtime-core => spectests}/spectests/f32_cmp.wast (100%) rename lib/{runtime-core => spectests}/spectests/f64_.wast (100%) rename lib/{runtime-core => spectests}/spectests/f64_bitwise.wast (100%) rename lib/{runtime-core => spectests}/spectests/f64_cmp.wast (100%) rename lib/{runtime-core => spectests}/spectests/fac.wast (100%) rename lib/{runtime-core => spectests}/spectests/float_exprs.wast (100%) rename lib/{runtime-core => spectests}/spectests/float_literals.wast (100%) rename lib/{runtime-core => spectests}/spectests/float_memory.wast (100%) rename lib/{runtime-core => spectests}/spectests/float_misc.wast (100%) rename lib/{runtime-core => spectests}/spectests/forward.wast (100%) rename lib/{runtime-core => spectests}/spectests/func.wast (100%) rename lib/{runtime-core => spectests}/spectests/func_ptrs.wast (100%) rename lib/{runtime-core => spectests}/spectests/get_local.wast (100%) rename lib/{runtime-core => spectests}/spectests/globals.wast (100%) rename lib/{runtime-core => spectests}/spectests/i32_.wast (100%) rename lib/{runtime-core => spectests}/spectests/i64_.wast (100%) rename lib/{runtime-core => spectests}/spectests/if_.wast (100%) rename lib/{runtime-core => spectests}/spectests/int_exprs.wast (100%) rename lib/{runtime-core => spectests}/spectests/int_literals.wast (100%) rename lib/{runtime-core => spectests}/spectests/labels.wast (100%) rename lib/{runtime-core => spectests}/spectests/left_to_right.wast (100%) rename lib/{runtime-core => spectests}/spectests/loop_.wast (100%) rename lib/{runtime-core => spectests}/spectests/memory.wast (100%) rename lib/{runtime-core => spectests}/spectests/memory_grow.wast (100%) rename lib/{runtime-core => spectests}/spectests/memory_redundancy.wast (100%) rename lib/{runtime-core => spectests}/spectests/memory_trap.wast (100%) rename lib/{runtime-core => spectests}/spectests/nop.wast (100%) rename lib/{runtime-core => spectests}/spectests/return_.wast (100%) rename lib/{runtime-core => spectests}/spectests/select.wast (100%) rename lib/{runtime-core => spectests}/spectests/set_local.wast (100%) rename lib/{runtime-core => spectests}/spectests/stack.wast (100%) rename lib/{runtime-core => spectests}/spectests/start.wast (100%) rename lib/{runtime-core => spectests}/spectests/store_retval.wast (100%) rename lib/{runtime-core => spectests}/spectests/switch.wast (100%) rename lib/{runtime-core => spectests}/spectests/tee_local.wast (100%) rename lib/{runtime-core => spectests}/spectests/token.wast (100%) rename lib/{runtime-core => spectests}/spectests/traps.wast (100%) rename lib/{runtime-core => spectests}/spectests/typecheck.wast (100%) rename lib/{runtime-core => spectests}/spectests/types.wast (100%) rename lib/{runtime-core => spectests}/spectests/unwind.wast (100%) rename lib/{runtime-core => spectests}/tests/semantics.rs (100%) rename lib/{runtime-core => spectests}/tests/spectest.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 827078100..58ff5f9a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -542,12 +542,20 @@ dependencies = [ "hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "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)", - "wabt 0.7.2 (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.2 (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" diff --git a/Cargo.toml b/Cargo.toml index c9a264f47..b570c9b09 100644 --- a/Cargo.toml +++ b/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" diff --git a/Makefile b/Makefile index 020cb092c..44d2f6037 100644 --- a/Makefile +++ b/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 diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml index 861fb14d7..233618ccb 100644 --- a/lib/runtime-core/Cargo.toml +++ b/lib/runtime-core/Cargo.toml @@ -6,7 +6,6 @@ license = "MIT" authors = ["The Wasmer Engineering Team "] repository = "https://github.com/wasmerio/wasmer" edition = "2018" -build = "build/mod.rs" [dependencies] hashbrown = "0.1" @@ -20,17 +19,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 = [] + diff --git a/lib/spectests/Cargo.toml b/lib/spectests/Cargo.toml new file mode 100644 index 000000000..f69782b40 --- /dev/null +++ b/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 "] +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 = [] \ No newline at end of file diff --git a/lib/runtime-core/build/mod.rs b/lib/spectests/build/mod.rs similarity index 100% rename from lib/runtime-core/build/mod.rs rename to lib/spectests/build/mod.rs diff --git a/lib/runtime-core/build/spectests.rs b/lib/spectests/build/spectests.rs similarity index 100% rename from lib/runtime-core/build/spectests.rs rename to lib/spectests/build/spectests.rs diff --git a/lib/runtime-core/examples/simple/main.rs b/lib/spectests/examples/simple/main.rs similarity index 100% rename from lib/runtime-core/examples/simple/main.rs rename to lib/spectests/examples/simple/main.rs diff --git a/lib/runtime-core/examples/simple/simple.wasm b/lib/spectests/examples/simple/simple.wasm similarity index 100% rename from lib/runtime-core/examples/simple/simple.wasm rename to lib/spectests/examples/simple/simple.wasm diff --git a/lib/runtime-core/examples/test.rs b/lib/spectests/examples/test.rs similarity index 100% rename from lib/runtime-core/examples/test.rs rename to lib/spectests/examples/test.rs diff --git a/lib/runtime-core/spectests/README.md b/lib/spectests/spectests/README.md similarity index 100% rename from lib/runtime-core/spectests/README.md rename to lib/spectests/spectests/README.md diff --git a/lib/runtime-core/spectests/address.wast b/lib/spectests/spectests/address.wast similarity index 100% rename from lib/runtime-core/spectests/address.wast rename to lib/spectests/spectests/address.wast diff --git a/lib/runtime-core/spectests/align.wast b/lib/spectests/spectests/align.wast similarity index 100% rename from lib/runtime-core/spectests/align.wast rename to lib/spectests/spectests/align.wast diff --git a/lib/runtime-core/spectests/binary.wast b/lib/spectests/spectests/binary.wast similarity index 100% rename from lib/runtime-core/spectests/binary.wast rename to lib/spectests/spectests/binary.wast diff --git a/lib/runtime-core/spectests/block.wast b/lib/spectests/spectests/block.wast similarity index 100% rename from lib/runtime-core/spectests/block.wast rename to lib/spectests/spectests/block.wast diff --git a/lib/runtime-core/spectests/br.wast b/lib/spectests/spectests/br.wast similarity index 100% rename from lib/runtime-core/spectests/br.wast rename to lib/spectests/spectests/br.wast diff --git a/lib/runtime-core/spectests/br_if.wast b/lib/spectests/spectests/br_if.wast similarity index 100% rename from lib/runtime-core/spectests/br_if.wast rename to lib/spectests/spectests/br_if.wast diff --git a/lib/runtime-core/spectests/br_table.wast b/lib/spectests/spectests/br_table.wast similarity index 100% rename from lib/runtime-core/spectests/br_table.wast rename to lib/spectests/spectests/br_table.wast diff --git a/lib/runtime-core/spectests/break_drop.wast b/lib/spectests/spectests/break_drop.wast similarity index 100% rename from lib/runtime-core/spectests/break_drop.wast rename to lib/spectests/spectests/break_drop.wast diff --git a/lib/runtime-core/spectests/call.wast b/lib/spectests/spectests/call.wast similarity index 100% rename from lib/runtime-core/spectests/call.wast rename to lib/spectests/spectests/call.wast diff --git a/lib/runtime-core/spectests/call_indirect.wast b/lib/spectests/spectests/call_indirect.wast similarity index 100% rename from lib/runtime-core/spectests/call_indirect.wast rename to lib/spectests/spectests/call_indirect.wast diff --git a/lib/runtime-core/spectests/comments.wast b/lib/spectests/spectests/comments.wast similarity index 100% rename from lib/runtime-core/spectests/comments.wast rename to lib/spectests/spectests/comments.wast diff --git a/lib/runtime-core/spectests/const_.wast b/lib/spectests/spectests/const_.wast similarity index 100% rename from lib/runtime-core/spectests/const_.wast rename to lib/spectests/spectests/const_.wast diff --git a/lib/runtime-core/spectests/conversions.wast b/lib/spectests/spectests/conversions.wast similarity index 100% rename from lib/runtime-core/spectests/conversions.wast rename to lib/spectests/spectests/conversions.wast diff --git a/lib/runtime-core/spectests/custom.wast b/lib/spectests/spectests/custom.wast similarity index 100% rename from lib/runtime-core/spectests/custom.wast rename to lib/spectests/spectests/custom.wast diff --git a/lib/runtime-core/spectests/data.wast b/lib/spectests/spectests/data.wast similarity index 100% rename from lib/runtime-core/spectests/data.wast rename to lib/spectests/spectests/data.wast diff --git a/lib/runtime-core/spectests/elem.wast b/lib/spectests/spectests/elem.wast similarity index 100% rename from lib/runtime-core/spectests/elem.wast rename to lib/spectests/spectests/elem.wast diff --git a/lib/runtime-core/spectests/endianness.wast b/lib/spectests/spectests/endianness.wast similarity index 100% rename from lib/runtime-core/spectests/endianness.wast rename to lib/spectests/spectests/endianness.wast diff --git a/lib/runtime-core/spectests/exports.wast b/lib/spectests/spectests/exports.wast similarity index 100% rename from lib/runtime-core/spectests/exports.wast rename to lib/spectests/spectests/exports.wast diff --git a/lib/runtime-core/spectests/f32_.wast b/lib/spectests/spectests/f32_.wast similarity index 100% rename from lib/runtime-core/spectests/f32_.wast rename to lib/spectests/spectests/f32_.wast diff --git a/lib/runtime-core/spectests/f32_bitwise.wast b/lib/spectests/spectests/f32_bitwise.wast similarity index 100% rename from lib/runtime-core/spectests/f32_bitwise.wast rename to lib/spectests/spectests/f32_bitwise.wast diff --git a/lib/runtime-core/spectests/f32_cmp.wast b/lib/spectests/spectests/f32_cmp.wast similarity index 100% rename from lib/runtime-core/spectests/f32_cmp.wast rename to lib/spectests/spectests/f32_cmp.wast diff --git a/lib/runtime-core/spectests/f64_.wast b/lib/spectests/spectests/f64_.wast similarity index 100% rename from lib/runtime-core/spectests/f64_.wast rename to lib/spectests/spectests/f64_.wast diff --git a/lib/runtime-core/spectests/f64_bitwise.wast b/lib/spectests/spectests/f64_bitwise.wast similarity index 100% rename from lib/runtime-core/spectests/f64_bitwise.wast rename to lib/spectests/spectests/f64_bitwise.wast diff --git a/lib/runtime-core/spectests/f64_cmp.wast b/lib/spectests/spectests/f64_cmp.wast similarity index 100% rename from lib/runtime-core/spectests/f64_cmp.wast rename to lib/spectests/spectests/f64_cmp.wast diff --git a/lib/runtime-core/spectests/fac.wast b/lib/spectests/spectests/fac.wast similarity index 100% rename from lib/runtime-core/spectests/fac.wast rename to lib/spectests/spectests/fac.wast diff --git a/lib/runtime-core/spectests/float_exprs.wast b/lib/spectests/spectests/float_exprs.wast similarity index 100% rename from lib/runtime-core/spectests/float_exprs.wast rename to lib/spectests/spectests/float_exprs.wast diff --git a/lib/runtime-core/spectests/float_literals.wast b/lib/spectests/spectests/float_literals.wast similarity index 100% rename from lib/runtime-core/spectests/float_literals.wast rename to lib/spectests/spectests/float_literals.wast diff --git a/lib/runtime-core/spectests/float_memory.wast b/lib/spectests/spectests/float_memory.wast similarity index 100% rename from lib/runtime-core/spectests/float_memory.wast rename to lib/spectests/spectests/float_memory.wast diff --git a/lib/runtime-core/spectests/float_misc.wast b/lib/spectests/spectests/float_misc.wast similarity index 100% rename from lib/runtime-core/spectests/float_misc.wast rename to lib/spectests/spectests/float_misc.wast diff --git a/lib/runtime-core/spectests/forward.wast b/lib/spectests/spectests/forward.wast similarity index 100% rename from lib/runtime-core/spectests/forward.wast rename to lib/spectests/spectests/forward.wast diff --git a/lib/runtime-core/spectests/func.wast b/lib/spectests/spectests/func.wast similarity index 100% rename from lib/runtime-core/spectests/func.wast rename to lib/spectests/spectests/func.wast diff --git a/lib/runtime-core/spectests/func_ptrs.wast b/lib/spectests/spectests/func_ptrs.wast similarity index 100% rename from lib/runtime-core/spectests/func_ptrs.wast rename to lib/spectests/spectests/func_ptrs.wast diff --git a/lib/runtime-core/spectests/get_local.wast b/lib/spectests/spectests/get_local.wast similarity index 100% rename from lib/runtime-core/spectests/get_local.wast rename to lib/spectests/spectests/get_local.wast diff --git a/lib/runtime-core/spectests/globals.wast b/lib/spectests/spectests/globals.wast similarity index 100% rename from lib/runtime-core/spectests/globals.wast rename to lib/spectests/spectests/globals.wast diff --git a/lib/runtime-core/spectests/i32_.wast b/lib/spectests/spectests/i32_.wast similarity index 100% rename from lib/runtime-core/spectests/i32_.wast rename to lib/spectests/spectests/i32_.wast diff --git a/lib/runtime-core/spectests/i64_.wast b/lib/spectests/spectests/i64_.wast similarity index 100% rename from lib/runtime-core/spectests/i64_.wast rename to lib/spectests/spectests/i64_.wast diff --git a/lib/runtime-core/spectests/if_.wast b/lib/spectests/spectests/if_.wast similarity index 100% rename from lib/runtime-core/spectests/if_.wast rename to lib/spectests/spectests/if_.wast diff --git a/lib/runtime-core/spectests/int_exprs.wast b/lib/spectests/spectests/int_exprs.wast similarity index 100% rename from lib/runtime-core/spectests/int_exprs.wast rename to lib/spectests/spectests/int_exprs.wast diff --git a/lib/runtime-core/spectests/int_literals.wast b/lib/spectests/spectests/int_literals.wast similarity index 100% rename from lib/runtime-core/spectests/int_literals.wast rename to lib/spectests/spectests/int_literals.wast diff --git a/lib/runtime-core/spectests/labels.wast b/lib/spectests/spectests/labels.wast similarity index 100% rename from lib/runtime-core/spectests/labels.wast rename to lib/spectests/spectests/labels.wast diff --git a/lib/runtime-core/spectests/left_to_right.wast b/lib/spectests/spectests/left_to_right.wast similarity index 100% rename from lib/runtime-core/spectests/left_to_right.wast rename to lib/spectests/spectests/left_to_right.wast diff --git a/lib/runtime-core/spectests/loop_.wast b/lib/spectests/spectests/loop_.wast similarity index 100% rename from lib/runtime-core/spectests/loop_.wast rename to lib/spectests/spectests/loop_.wast diff --git a/lib/runtime-core/spectests/memory.wast b/lib/spectests/spectests/memory.wast similarity index 100% rename from lib/runtime-core/spectests/memory.wast rename to lib/spectests/spectests/memory.wast diff --git a/lib/runtime-core/spectests/memory_grow.wast b/lib/spectests/spectests/memory_grow.wast similarity index 100% rename from lib/runtime-core/spectests/memory_grow.wast rename to lib/spectests/spectests/memory_grow.wast diff --git a/lib/runtime-core/spectests/memory_redundancy.wast b/lib/spectests/spectests/memory_redundancy.wast similarity index 100% rename from lib/runtime-core/spectests/memory_redundancy.wast rename to lib/spectests/spectests/memory_redundancy.wast diff --git a/lib/runtime-core/spectests/memory_trap.wast b/lib/spectests/spectests/memory_trap.wast similarity index 100% rename from lib/runtime-core/spectests/memory_trap.wast rename to lib/spectests/spectests/memory_trap.wast diff --git a/lib/runtime-core/spectests/nop.wast b/lib/spectests/spectests/nop.wast similarity index 100% rename from lib/runtime-core/spectests/nop.wast rename to lib/spectests/spectests/nop.wast diff --git a/lib/runtime-core/spectests/return_.wast b/lib/spectests/spectests/return_.wast similarity index 100% rename from lib/runtime-core/spectests/return_.wast rename to lib/spectests/spectests/return_.wast diff --git a/lib/runtime-core/spectests/select.wast b/lib/spectests/spectests/select.wast similarity index 100% rename from lib/runtime-core/spectests/select.wast rename to lib/spectests/spectests/select.wast diff --git a/lib/runtime-core/spectests/set_local.wast b/lib/spectests/spectests/set_local.wast similarity index 100% rename from lib/runtime-core/spectests/set_local.wast rename to lib/spectests/spectests/set_local.wast diff --git a/lib/runtime-core/spectests/stack.wast b/lib/spectests/spectests/stack.wast similarity index 100% rename from lib/runtime-core/spectests/stack.wast rename to lib/spectests/spectests/stack.wast diff --git a/lib/runtime-core/spectests/start.wast b/lib/spectests/spectests/start.wast similarity index 100% rename from lib/runtime-core/spectests/start.wast rename to lib/spectests/spectests/start.wast diff --git a/lib/runtime-core/spectests/store_retval.wast b/lib/spectests/spectests/store_retval.wast similarity index 100% rename from lib/runtime-core/spectests/store_retval.wast rename to lib/spectests/spectests/store_retval.wast diff --git a/lib/runtime-core/spectests/switch.wast b/lib/spectests/spectests/switch.wast similarity index 100% rename from lib/runtime-core/spectests/switch.wast rename to lib/spectests/spectests/switch.wast diff --git a/lib/runtime-core/spectests/tee_local.wast b/lib/spectests/spectests/tee_local.wast similarity index 100% rename from lib/runtime-core/spectests/tee_local.wast rename to lib/spectests/spectests/tee_local.wast diff --git a/lib/runtime-core/spectests/token.wast b/lib/spectests/spectests/token.wast similarity index 100% rename from lib/runtime-core/spectests/token.wast rename to lib/spectests/spectests/token.wast diff --git a/lib/runtime-core/spectests/traps.wast b/lib/spectests/spectests/traps.wast similarity index 100% rename from lib/runtime-core/spectests/traps.wast rename to lib/spectests/spectests/traps.wast diff --git a/lib/runtime-core/spectests/typecheck.wast b/lib/spectests/spectests/typecheck.wast similarity index 100% rename from lib/runtime-core/spectests/typecheck.wast rename to lib/spectests/spectests/typecheck.wast diff --git a/lib/runtime-core/spectests/types.wast b/lib/spectests/spectests/types.wast similarity index 100% rename from lib/runtime-core/spectests/types.wast rename to lib/spectests/spectests/types.wast diff --git a/lib/runtime-core/spectests/unwind.wast b/lib/spectests/spectests/unwind.wast similarity index 100% rename from lib/runtime-core/spectests/unwind.wast rename to lib/spectests/spectests/unwind.wast diff --git a/lib/runtime-core/tests/semantics.rs b/lib/spectests/tests/semantics.rs similarity index 100% rename from lib/runtime-core/tests/semantics.rs rename to lib/spectests/tests/semantics.rs diff --git a/lib/runtime-core/tests/spectest.rs b/lib/spectests/tests/spectest.rs similarity index 100% rename from lib/runtime-core/tests/spectest.rs rename to lib/spectests/tests/spectest.rs From 73125edd619ad90fca32eb04a3f72ba6119dc4bf Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Thu, 31 Jan 2019 13:43:04 -0800 Subject: [PATCH 2/2] Fixed spectests ignored by git attributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index b7c3d068b..3426f1dee 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ lib/emscripten/emtests/* linguist-vendored -lib/runtime-core/spectests/* linguist-vendored +lib/spectests/spectests/* linguist-vendored