fix some tests that broke due to recent merges (#1287)

3 files changed, 6 insertions, 20 deletions

diff --git a/test/binaryen.js/call_import_error.js.txt b/test/binaryen.js/call_import_error.js.txt
index 498f603e1..6f2e3b2ac 100644
--- a/test/binaryen.js/call_import_error.js.txt
+++ b/test/binaryen.js/call_import_error.js.txt
@@ -11,12 +11,3 @@
 [wasm-validator error in function $main] unexpected false: call target must exist, on 
 [none] (call $fn)
 (perhaps it should be a CallImport instead of Call?)
-(module
- (type $v (func))
- (import "env" "fn" (func $fn))
- (memory $0 0)
- (export "main" (func $main))
- (func $main (; 1 ;) (type $v)
-  (call $fn)
- )
-)
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
index f1848aee5..16b5e4fb7 100644
--- a/test/binaryen.js/kitchen-sink.js
+++ b/test/binaryen.js/kitchen-sink.js
@@ -63,6 +63,7 @@ function test_ids() {
   console.log("BinaryenUnaryId: " + Binaryen.UnaryId);
   console.log("BinaryenBinaryId: " + Binaryen.BinaryId);
   console.log("BinaryenSelectId: " + Binaryen.SelectId);
+  console.log("BinaryenDropId: " + Binaryen.DropId);
   console.log("BinaryenReturnId: " + Binaryen.ReturnId);
   console.log("BinaryenHostId: " + Binaryen.HostId);
   console.log("BinaryenNopId: " + Binaryen.NopId);
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index c16b13770..bb1e7292f 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -1098,20 +1098,10 @@ module loaded from binary form:
  )
 )
 
-[wasm-validator error in function $func] 1 != 2: set_local type must match function, on
+[wasm-validator error in function $func] 1 != 2: set_local type must match function, on 
 [none] (set_local $0
  [i64] (i64.const 1234)
 )
-(module
- (type $v (func))
- (memory $0 0)
- (func $func (; 0 ;) (type $v)
-  (local $0 i32)
-  (set_local $0
-   (i64.const 1234)
-  )
- )
-)
 validation: 0
 // beginning a Binaryen API trace
 #include <math.h>
@@ -1394,6 +1384,10 @@ int main() {
   expressions[244] = BinaryenReturn(the_module, expressions[243]);
   expressions[245] = BinaryenNop(the_module);
   expressions[246] = BinaryenUnreachable(the_module);
+  BinaryenExpressionGetId(expressions[30]);
+getExpressionId=16
+  BinaryenExpressionGetType(expressions[30]);
+getExpressionType=3
   BinaryenExpressionPrint(expressions[30]);
 (f32.neg
  (f32.const -33.61199951171875)