From cced2c8b0c101246f108c8f302c78b81e738f5e5 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Mon, 27 Nov 2017 12:46:53 -0800 Subject: [PATCH] Fix wat syntax so wasm tests pass (#199) * wasm testsuite: ignore hidden files in test dir and report a rejected file. it was picking up vim .swp files * wasmtests: correct wat syntax in icall.wat --- cranelift/wasmtests/icall.wat | 2 +- lib/wasm/tests/testsuite.rs | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cranelift/wasmtests/icall.wat b/cranelift/wasmtests/icall.wat index 21894c55ca..76f28f47a9 100644 --- a/cranelift/wasmtests/icall.wat +++ b/cranelift/wasmtests/icall.wat @@ -1,7 +1,7 @@ (module (type $ft (func (param f32) (result i32))) (func $foo (export "foo") (param i32 f32) (result i32) - (call_indirect $ft (get_local 1) (get_local 0)) + (call_indirect (type $ft) (get_local 1) (get_local 0)) ) (table (;0;) 23 23 anyfunc) ) diff --git a/lib/wasm/tests/testsuite.rs b/lib/wasm/tests/testsuite.rs index 687aa7c938..c551dbf783 100644 --- a/lib/wasm/tests/testsuite.rs +++ b/lib/wasm/tests/testsuite.rs @@ -23,6 +23,15 @@ fn testsuite() { let mut paths: Vec<_> = fs::read_dir("../../wasmtests") .unwrap() .map(|r| r.unwrap()) + .filter(|p| { + // Ignore files starting with `.`, which could be editor temporary files + if let Some(stem) = p.path().file_stem() { + if let Some(stemstr) = stem.to_str() { + return !stemstr.starts_with("."); + } + } + false + }) .collect(); paths.sort_by_key(|dir| dir.path()); let flags = Flags::new(&settings::builder()); @@ -88,7 +97,7 @@ fn handle_module(path: PathBuf, flags: &Flags) { } read_wasm_file(file_path).expect("error reading converted wasm file") } - None | Some(&_) => panic!("the file extension is not wasm or wat"), + None | Some(&_) => panic!("the file extension for {:?} is not wasm or wat", path), } } };