From ff0a50e31eff62f8b7bec1df109efd19663aaf8f Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 30 May 2019 10:34:34 -0700
Subject: [PATCH] Fix failing interpreter tests

---
 crates/wasm-interpreter/tests/smoke.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/crates/wasm-interpreter/tests/smoke.rs b/crates/wasm-interpreter/tests/smoke.rs
index 8bfbfa8c..37522960 100644
--- a/crates/wasm-interpreter/tests/smoke.rs
+++ b/crates/wasm-interpreter/tests/smoke.rs
@@ -17,7 +17,17 @@ fn interpret(wat: &str, name: &str, result: Option<&[u32]>) {
     assert!(status.success());
     let module = walrus::Module::from_file(output.path()).unwrap();
     let mut i = Interpreter::new(&module).unwrap();
-    assert_eq!(i.interpret_descriptor(name, &module), result);
+    let id = module
+        .exports
+        .iter()
+        .filter(|e| e.name == name)
+        .filter_map(|e| match e.item {
+            walrus::ExportItem::Function(f) => Some(f),
+            _ => None,
+        })
+        .next()
+        .unwrap();
+    assert_eq!(i.interpret_descriptor(id, &module), result);
 }
 
 #[test]
@@ -30,7 +40,6 @@ fn smoke() {
         )
     "#;
     interpret(wat, "foo", Some(&[]));
-    interpret(wat, "bar", None);
 
     let wat = r#"
         (module