From 954f7d3876d1c3c0d4e4321645cfba1bb64052ca Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Tue, 18 May 2021 22:48:52 +0200 Subject: [PATCH] cranelift: move wasmtests in cranelift-wasm Move test data used by cranelift-wasm's tests in the crate directory, to make the tests autonomous. Fixes #2910 --- cranelift/wasm/tests/wasm_testsuite.rs | 4 ++-- cranelift/{ => wasm}/wasmtests/arith.wat | 0 cranelift/{ => wasm}/wasmtests/br_table.wat | 0 cranelift/{ => wasm}/wasmtests/call-simd.wat | 0 cranelift/{ => wasm}/wasmtests/call.wat | 0 .../{ => wasm}/wasmtests/embenchen_fannkuch.wat | 0 cranelift/{ => wasm}/wasmtests/embenchen_fasta.wat | 0 cranelift/{ => wasm}/wasmtests/embenchen_ifs.wat | 0 cranelift/{ => wasm}/wasmtests/embenchen_primes.wat | 0 cranelift/{ => wasm}/wasmtests/fac-multi-value.wat | 0 cranelift/{ => wasm}/wasmtests/fibonacci.wat | 0 cranelift/{ => wasm}/wasmtests/globals.wat | 0 cranelift/{ => wasm}/wasmtests/icall-simd.wat | 0 cranelift/{ => wasm}/wasmtests/icall.wat | 0 .../wasmtests/if-reachability-translation-0.wat | 0 .../wasmtests/if-reachability-translation-1.wat | 0 .../wasmtests/if-reachability-translation-2.wat | 0 .../wasmtests/if-reachability-translation-3.wat | 0 .../wasmtests/if-reachability-translation-4.wat | 0 .../wasmtests/if-reachability-translation-5.wat | 0 .../wasmtests/if-reachability-translation-6.wat | 0 .../wasmtests/if-unreachable-else-params-2.wat | 0 .../wasmtests/if-unreachable-else-params.wat | 0 ...06-name-section-with-u32-max-function-index.wasm | Bin cranelift/{ => wasm}/wasmtests/memory.wat | 0 cranelift/{ => wasm}/wasmtests/multi-0.wat | 0 cranelift/{ => wasm}/wasmtests/multi-1.wat | 0 cranelift/{ => wasm}/wasmtests/multi-10.wat | 0 cranelift/{ => wasm}/wasmtests/multi-11.wat | 0 cranelift/{ => wasm}/wasmtests/multi-12.wat | 0 cranelift/{ => wasm}/wasmtests/multi-13.wat | 0 cranelift/{ => wasm}/wasmtests/multi-14.wat | 0 cranelift/{ => wasm}/wasmtests/multi-15.wat | 0 cranelift/{ => wasm}/wasmtests/multi-16.wat | 0 cranelift/{ => wasm}/wasmtests/multi-17.wat | 0 cranelift/{ => wasm}/wasmtests/multi-2.wat | 0 cranelift/{ => wasm}/wasmtests/multi-3.wat | 0 cranelift/{ => wasm}/wasmtests/multi-4.wat | 0 cranelift/{ => wasm}/wasmtests/multi-5.wat | 0 cranelift/{ => wasm}/wasmtests/multi-6.wat | 0 cranelift/{ => wasm}/wasmtests/multi-7.wat | 0 cranelift/{ => wasm}/wasmtests/multi-8.wat | 0 cranelift/{ => wasm}/wasmtests/multi-9.wat | 0 cranelift/{ => wasm}/wasmtests/nullref.wat | 0 cranelift/{ => wasm}/wasmtests/passive-data.wat | 0 cranelift/{ => wasm}/wasmtests/pr2303.wat | 0 cranelift/{ => wasm}/wasmtests/pr2559.wat | 0 cranelift/{ => wasm}/wasmtests/ref-func-0.wat | 0 cranelift/{ => wasm}/wasmtests/rust_fannkuch.wat | 0 cranelift/{ => wasm}/wasmtests/select.wat | 0 cranelift/{ => wasm}/wasmtests/simd.wat | 0 cranelift/{ => wasm}/wasmtests/table-copy.wat | 0 cranelift/{ => wasm}/wasmtests/unreachable_code.wat | 0 .../{ => wasm}/wasmtests/use_fallthrough_return.wat | 0 54 files changed, 2 insertions(+), 2 deletions(-) rename cranelift/{ => wasm}/wasmtests/arith.wat (100%) rename cranelift/{ => wasm}/wasmtests/br_table.wat (100%) rename cranelift/{ => wasm}/wasmtests/call-simd.wat (100%) rename cranelift/{ => wasm}/wasmtests/call.wat (100%) rename cranelift/{ => wasm}/wasmtests/embenchen_fannkuch.wat (100%) rename cranelift/{ => wasm}/wasmtests/embenchen_fasta.wat (100%) rename cranelift/{ => wasm}/wasmtests/embenchen_ifs.wat (100%) rename cranelift/{ => wasm}/wasmtests/embenchen_primes.wat (100%) rename cranelift/{ => wasm}/wasmtests/fac-multi-value.wat (100%) rename cranelift/{ => wasm}/wasmtests/fibonacci.wat (100%) rename cranelift/{ => wasm}/wasmtests/globals.wat (100%) rename cranelift/{ => wasm}/wasmtests/icall-simd.wat (100%) rename cranelift/{ => wasm}/wasmtests/icall.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-reachability-translation-0.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-reachability-translation-1.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-reachability-translation-2.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-reachability-translation-3.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-reachability-translation-4.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-reachability-translation-5.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-reachability-translation-6.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-unreachable-else-params-2.wat (100%) rename cranelift/{ => wasm}/wasmtests/if-unreachable-else-params.wat (100%) rename cranelift/{ => wasm}/wasmtests/issue-1306-name-section-with-u32-max-function-index.wasm (100%) rename cranelift/{ => wasm}/wasmtests/memory.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-0.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-1.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-10.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-11.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-12.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-13.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-14.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-15.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-16.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-17.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-2.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-3.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-4.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-5.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-6.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-7.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-8.wat (100%) rename cranelift/{ => wasm}/wasmtests/multi-9.wat (100%) rename cranelift/{ => wasm}/wasmtests/nullref.wat (100%) rename cranelift/{ => wasm}/wasmtests/passive-data.wat (100%) rename cranelift/{ => wasm}/wasmtests/pr2303.wat (100%) rename cranelift/{ => wasm}/wasmtests/pr2559.wat (100%) rename cranelift/{ => wasm}/wasmtests/ref-func-0.wat (100%) rename cranelift/{ => wasm}/wasmtests/rust_fannkuch.wat (100%) rename cranelift/{ => wasm}/wasmtests/select.wat (100%) rename cranelift/{ => wasm}/wasmtests/simd.wat (100%) rename cranelift/{ => wasm}/wasmtests/table-copy.wat (100%) rename cranelift/{ => wasm}/wasmtests/unreachable_code.wat (100%) rename cranelift/{ => wasm}/wasmtests/use_fallthrough_return.wat (100%) diff --git a/cranelift/wasm/tests/wasm_testsuite.rs b/cranelift/wasm/tests/wasm_testsuite.rs index 713a4396d5..a2e0f7db7c 100644 --- a/cranelift/wasm/tests/wasm_testsuite.rs +++ b/cranelift/wasm/tests/wasm_testsuite.rs @@ -10,7 +10,7 @@ use target_lexicon::triple; #[test] fn testsuite() { - let mut paths: Vec<_> = fs::read_dir("../wasmtests") + let mut paths: Vec<_> = fs::read_dir("./wasmtests") .unwrap() .map(|r| r.unwrap()) .filter(|p| { @@ -36,7 +36,7 @@ fn testsuite() { #[test] fn use_fallthrough_return() { let flags = Flags::new(settings::builder()); - let path = Path::new("../wasmtests/use_fallthrough_return.wat"); + let path = Path::new("./wasmtests/use_fallthrough_return.wat"); let data = read_module(&path); handle_module(data, &flags, ReturnMode::FallthroughReturn); } diff --git a/cranelift/wasmtests/arith.wat b/cranelift/wasm/wasmtests/arith.wat similarity index 100% rename from cranelift/wasmtests/arith.wat rename to cranelift/wasm/wasmtests/arith.wat diff --git a/cranelift/wasmtests/br_table.wat b/cranelift/wasm/wasmtests/br_table.wat similarity index 100% rename from cranelift/wasmtests/br_table.wat rename to cranelift/wasm/wasmtests/br_table.wat diff --git a/cranelift/wasmtests/call-simd.wat b/cranelift/wasm/wasmtests/call-simd.wat similarity index 100% rename from cranelift/wasmtests/call-simd.wat rename to cranelift/wasm/wasmtests/call-simd.wat diff --git a/cranelift/wasmtests/call.wat b/cranelift/wasm/wasmtests/call.wat similarity index 100% rename from cranelift/wasmtests/call.wat rename to cranelift/wasm/wasmtests/call.wat diff --git a/cranelift/wasmtests/embenchen_fannkuch.wat b/cranelift/wasm/wasmtests/embenchen_fannkuch.wat similarity index 100% rename from cranelift/wasmtests/embenchen_fannkuch.wat rename to cranelift/wasm/wasmtests/embenchen_fannkuch.wat diff --git a/cranelift/wasmtests/embenchen_fasta.wat b/cranelift/wasm/wasmtests/embenchen_fasta.wat similarity index 100% rename from cranelift/wasmtests/embenchen_fasta.wat rename to cranelift/wasm/wasmtests/embenchen_fasta.wat diff --git a/cranelift/wasmtests/embenchen_ifs.wat b/cranelift/wasm/wasmtests/embenchen_ifs.wat similarity index 100% rename from cranelift/wasmtests/embenchen_ifs.wat rename to cranelift/wasm/wasmtests/embenchen_ifs.wat diff --git a/cranelift/wasmtests/embenchen_primes.wat b/cranelift/wasm/wasmtests/embenchen_primes.wat similarity index 100% rename from cranelift/wasmtests/embenchen_primes.wat rename to cranelift/wasm/wasmtests/embenchen_primes.wat diff --git a/cranelift/wasmtests/fac-multi-value.wat b/cranelift/wasm/wasmtests/fac-multi-value.wat similarity index 100% rename from cranelift/wasmtests/fac-multi-value.wat rename to cranelift/wasm/wasmtests/fac-multi-value.wat diff --git a/cranelift/wasmtests/fibonacci.wat b/cranelift/wasm/wasmtests/fibonacci.wat similarity index 100% rename from cranelift/wasmtests/fibonacci.wat rename to cranelift/wasm/wasmtests/fibonacci.wat diff --git a/cranelift/wasmtests/globals.wat b/cranelift/wasm/wasmtests/globals.wat similarity index 100% rename from cranelift/wasmtests/globals.wat rename to cranelift/wasm/wasmtests/globals.wat diff --git a/cranelift/wasmtests/icall-simd.wat b/cranelift/wasm/wasmtests/icall-simd.wat similarity index 100% rename from cranelift/wasmtests/icall-simd.wat rename to cranelift/wasm/wasmtests/icall-simd.wat diff --git a/cranelift/wasmtests/icall.wat b/cranelift/wasm/wasmtests/icall.wat similarity index 100% rename from cranelift/wasmtests/icall.wat rename to cranelift/wasm/wasmtests/icall.wat diff --git a/cranelift/wasmtests/if-reachability-translation-0.wat b/cranelift/wasm/wasmtests/if-reachability-translation-0.wat similarity index 100% rename from cranelift/wasmtests/if-reachability-translation-0.wat rename to cranelift/wasm/wasmtests/if-reachability-translation-0.wat diff --git a/cranelift/wasmtests/if-reachability-translation-1.wat b/cranelift/wasm/wasmtests/if-reachability-translation-1.wat similarity index 100% rename from cranelift/wasmtests/if-reachability-translation-1.wat rename to cranelift/wasm/wasmtests/if-reachability-translation-1.wat diff --git a/cranelift/wasmtests/if-reachability-translation-2.wat b/cranelift/wasm/wasmtests/if-reachability-translation-2.wat similarity index 100% rename from cranelift/wasmtests/if-reachability-translation-2.wat rename to cranelift/wasm/wasmtests/if-reachability-translation-2.wat diff --git a/cranelift/wasmtests/if-reachability-translation-3.wat b/cranelift/wasm/wasmtests/if-reachability-translation-3.wat similarity index 100% rename from cranelift/wasmtests/if-reachability-translation-3.wat rename to cranelift/wasm/wasmtests/if-reachability-translation-3.wat diff --git a/cranelift/wasmtests/if-reachability-translation-4.wat b/cranelift/wasm/wasmtests/if-reachability-translation-4.wat similarity index 100% rename from cranelift/wasmtests/if-reachability-translation-4.wat rename to cranelift/wasm/wasmtests/if-reachability-translation-4.wat diff --git a/cranelift/wasmtests/if-reachability-translation-5.wat b/cranelift/wasm/wasmtests/if-reachability-translation-5.wat similarity index 100% rename from cranelift/wasmtests/if-reachability-translation-5.wat rename to cranelift/wasm/wasmtests/if-reachability-translation-5.wat diff --git a/cranelift/wasmtests/if-reachability-translation-6.wat b/cranelift/wasm/wasmtests/if-reachability-translation-6.wat similarity index 100% rename from cranelift/wasmtests/if-reachability-translation-6.wat rename to cranelift/wasm/wasmtests/if-reachability-translation-6.wat diff --git a/cranelift/wasmtests/if-unreachable-else-params-2.wat b/cranelift/wasm/wasmtests/if-unreachable-else-params-2.wat similarity index 100% rename from cranelift/wasmtests/if-unreachable-else-params-2.wat rename to cranelift/wasm/wasmtests/if-unreachable-else-params-2.wat diff --git a/cranelift/wasmtests/if-unreachable-else-params.wat b/cranelift/wasm/wasmtests/if-unreachable-else-params.wat similarity index 100% rename from cranelift/wasmtests/if-unreachable-else-params.wat rename to cranelift/wasm/wasmtests/if-unreachable-else-params.wat diff --git a/cranelift/wasmtests/issue-1306-name-section-with-u32-max-function-index.wasm b/cranelift/wasm/wasmtests/issue-1306-name-section-with-u32-max-function-index.wasm similarity index 100% rename from cranelift/wasmtests/issue-1306-name-section-with-u32-max-function-index.wasm rename to cranelift/wasm/wasmtests/issue-1306-name-section-with-u32-max-function-index.wasm diff --git a/cranelift/wasmtests/memory.wat b/cranelift/wasm/wasmtests/memory.wat similarity index 100% rename from cranelift/wasmtests/memory.wat rename to cranelift/wasm/wasmtests/memory.wat diff --git a/cranelift/wasmtests/multi-0.wat b/cranelift/wasm/wasmtests/multi-0.wat similarity index 100% rename from cranelift/wasmtests/multi-0.wat rename to cranelift/wasm/wasmtests/multi-0.wat diff --git a/cranelift/wasmtests/multi-1.wat b/cranelift/wasm/wasmtests/multi-1.wat similarity index 100% rename from cranelift/wasmtests/multi-1.wat rename to cranelift/wasm/wasmtests/multi-1.wat diff --git a/cranelift/wasmtests/multi-10.wat b/cranelift/wasm/wasmtests/multi-10.wat similarity index 100% rename from cranelift/wasmtests/multi-10.wat rename to cranelift/wasm/wasmtests/multi-10.wat diff --git a/cranelift/wasmtests/multi-11.wat b/cranelift/wasm/wasmtests/multi-11.wat similarity index 100% rename from cranelift/wasmtests/multi-11.wat rename to cranelift/wasm/wasmtests/multi-11.wat diff --git a/cranelift/wasmtests/multi-12.wat b/cranelift/wasm/wasmtests/multi-12.wat similarity index 100% rename from cranelift/wasmtests/multi-12.wat rename to cranelift/wasm/wasmtests/multi-12.wat diff --git a/cranelift/wasmtests/multi-13.wat b/cranelift/wasm/wasmtests/multi-13.wat similarity index 100% rename from cranelift/wasmtests/multi-13.wat rename to cranelift/wasm/wasmtests/multi-13.wat diff --git a/cranelift/wasmtests/multi-14.wat b/cranelift/wasm/wasmtests/multi-14.wat similarity index 100% rename from cranelift/wasmtests/multi-14.wat rename to cranelift/wasm/wasmtests/multi-14.wat diff --git a/cranelift/wasmtests/multi-15.wat b/cranelift/wasm/wasmtests/multi-15.wat similarity index 100% rename from cranelift/wasmtests/multi-15.wat rename to cranelift/wasm/wasmtests/multi-15.wat diff --git a/cranelift/wasmtests/multi-16.wat b/cranelift/wasm/wasmtests/multi-16.wat similarity index 100% rename from cranelift/wasmtests/multi-16.wat rename to cranelift/wasm/wasmtests/multi-16.wat diff --git a/cranelift/wasmtests/multi-17.wat b/cranelift/wasm/wasmtests/multi-17.wat similarity index 100% rename from cranelift/wasmtests/multi-17.wat rename to cranelift/wasm/wasmtests/multi-17.wat diff --git a/cranelift/wasmtests/multi-2.wat b/cranelift/wasm/wasmtests/multi-2.wat similarity index 100% rename from cranelift/wasmtests/multi-2.wat rename to cranelift/wasm/wasmtests/multi-2.wat diff --git a/cranelift/wasmtests/multi-3.wat b/cranelift/wasm/wasmtests/multi-3.wat similarity index 100% rename from cranelift/wasmtests/multi-3.wat rename to cranelift/wasm/wasmtests/multi-3.wat diff --git a/cranelift/wasmtests/multi-4.wat b/cranelift/wasm/wasmtests/multi-4.wat similarity index 100% rename from cranelift/wasmtests/multi-4.wat rename to cranelift/wasm/wasmtests/multi-4.wat diff --git a/cranelift/wasmtests/multi-5.wat b/cranelift/wasm/wasmtests/multi-5.wat similarity index 100% rename from cranelift/wasmtests/multi-5.wat rename to cranelift/wasm/wasmtests/multi-5.wat diff --git a/cranelift/wasmtests/multi-6.wat b/cranelift/wasm/wasmtests/multi-6.wat similarity index 100% rename from cranelift/wasmtests/multi-6.wat rename to cranelift/wasm/wasmtests/multi-6.wat diff --git a/cranelift/wasmtests/multi-7.wat b/cranelift/wasm/wasmtests/multi-7.wat similarity index 100% rename from cranelift/wasmtests/multi-7.wat rename to cranelift/wasm/wasmtests/multi-7.wat diff --git a/cranelift/wasmtests/multi-8.wat b/cranelift/wasm/wasmtests/multi-8.wat similarity index 100% rename from cranelift/wasmtests/multi-8.wat rename to cranelift/wasm/wasmtests/multi-8.wat diff --git a/cranelift/wasmtests/multi-9.wat b/cranelift/wasm/wasmtests/multi-9.wat similarity index 100% rename from cranelift/wasmtests/multi-9.wat rename to cranelift/wasm/wasmtests/multi-9.wat diff --git a/cranelift/wasmtests/nullref.wat b/cranelift/wasm/wasmtests/nullref.wat similarity index 100% rename from cranelift/wasmtests/nullref.wat rename to cranelift/wasm/wasmtests/nullref.wat diff --git a/cranelift/wasmtests/passive-data.wat b/cranelift/wasm/wasmtests/passive-data.wat similarity index 100% rename from cranelift/wasmtests/passive-data.wat rename to cranelift/wasm/wasmtests/passive-data.wat diff --git a/cranelift/wasmtests/pr2303.wat b/cranelift/wasm/wasmtests/pr2303.wat similarity index 100% rename from cranelift/wasmtests/pr2303.wat rename to cranelift/wasm/wasmtests/pr2303.wat diff --git a/cranelift/wasmtests/pr2559.wat b/cranelift/wasm/wasmtests/pr2559.wat similarity index 100% rename from cranelift/wasmtests/pr2559.wat rename to cranelift/wasm/wasmtests/pr2559.wat diff --git a/cranelift/wasmtests/ref-func-0.wat b/cranelift/wasm/wasmtests/ref-func-0.wat similarity index 100% rename from cranelift/wasmtests/ref-func-0.wat rename to cranelift/wasm/wasmtests/ref-func-0.wat diff --git a/cranelift/wasmtests/rust_fannkuch.wat b/cranelift/wasm/wasmtests/rust_fannkuch.wat similarity index 100% rename from cranelift/wasmtests/rust_fannkuch.wat rename to cranelift/wasm/wasmtests/rust_fannkuch.wat diff --git a/cranelift/wasmtests/select.wat b/cranelift/wasm/wasmtests/select.wat similarity index 100% rename from cranelift/wasmtests/select.wat rename to cranelift/wasm/wasmtests/select.wat diff --git a/cranelift/wasmtests/simd.wat b/cranelift/wasm/wasmtests/simd.wat similarity index 100% rename from cranelift/wasmtests/simd.wat rename to cranelift/wasm/wasmtests/simd.wat diff --git a/cranelift/wasmtests/table-copy.wat b/cranelift/wasm/wasmtests/table-copy.wat similarity index 100% rename from cranelift/wasmtests/table-copy.wat rename to cranelift/wasm/wasmtests/table-copy.wat diff --git a/cranelift/wasmtests/unreachable_code.wat b/cranelift/wasm/wasmtests/unreachable_code.wat similarity index 100% rename from cranelift/wasmtests/unreachable_code.wat rename to cranelift/wasm/wasmtests/unreachable_code.wat diff --git a/cranelift/wasmtests/use_fallthrough_return.wat b/cranelift/wasm/wasmtests/use_fallthrough_return.wat similarity index 100% rename from cranelift/wasmtests/use_fallthrough_return.wat rename to cranelift/wasm/wasmtests/use_fallthrough_return.wat