From e2250bcb5e35c2382b9bc7fd9da8b7a0efe9a86f Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Fri, 13 May 2016 13:31:45 -0700
Subject: remove wasm2asm stuff from auto_update_tests

---
 auto_update_tests.py | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'auto_update_tests.py')

diff --git a/auto_update_tests.py b/auto_update_tests.py
index 5fa106747..b707e7f36 100755
--- a/auto_update_tests.py
+++ b/auto_update_tests.py
@@ -17,13 +17,6 @@ for asm in sorted(os.listdir('test')):
       actual, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
       open(os.path.join('test', wasm), 'w').write(actual)
 
-for wasm in sorted(os.listdir('test')):
-  if wasm.endswith('.wast') and os.path.basename(wasm) not in ['kitchen_sink.wast']: # i64s in kitchen_sink
-    print '..', wasm
-    asm = wasm.replace('.wast', '.2asm.js')
-    actual, err = subprocess.Popen([os.path.join('bin', 'wasm2asm'), os.path.join('test', wasm)], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-    open(os.path.join('test', asm), 'w').write(actual)
-
 for dot_s_dir in ['dot_s', 'llvm_autogenerated']:
   for s in sorted(os.listdir(os.path.join('test', dot_s_dir))):
     if not s.endswith('.s'): continue
-- 
cgit v1.2.3


From 3a92901ed09535a4fbcbf1dc97a85bd2c40c8df8 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Fri, 13 May 2016 13:31:59 -0700
Subject: test fixes

---
 auto_update_tests.py                | 3 +--
 test/example/c-api-kitchen-sink.c   | 2 +-
 test/example/c-api-kitchen-sink.txt | 2 +-
 test/reg_switch.wast                | 4 ++--
 test/reg_switch.wast.fromBinary     | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'auto_update_tests.py')

diff --git a/auto_update_tests.py b/auto_update_tests.py
index b707e7f36..378f511cc 100755
--- a/auto_update_tests.py
+++ b/auto_update_tests.py
@@ -104,7 +104,7 @@ for t in sorted(os.listdir(os.path.join('test', 'example'))):
     print ' '.join(extra)
     subprocess.check_call(extra)
     # Link against the binaryen C library DSO, using an executable-relative rpath
-    cmd = ['example.o', '-lbinaryen-c'] + cmd + ['-Wl,-rpath=$ORIGIN/../lib']
+    cmd = ['example.o', '-lbinaryen'] + cmd + ['-Wl,-rpath=$ORIGIN/../lib']
   else:
     continue
   if os.environ.get('COMPILER_FLAGS'):
@@ -119,5 +119,4 @@ for t in sorted(os.listdir(os.path.join('test', 'example'))):
   finally:
     os.remove(output_file)
 
-
 print '\n[ success! ]'
diff --git a/test/example/c-api-kitchen-sink.c b/test/example/c-api-kitchen-sink.c
index 13caa8c89..8de127340 100644
--- a/test/example/c-api-kitchen-sink.c
+++ b/test/example/c-api-kitchen-sink.c
@@ -118,7 +118,7 @@ void test_core() {
     makeUnary(module, BinaryenPromoteFloat32(), 3),
     makeUnary(module, BinaryenDemoteFloat64(), 4),
     makeUnary(module, BinaryenReinterpretInt32(), 1),
-    makeUnary(module, BinaryenReinterpretInt64(), 1),
+    makeUnary(module, BinaryenReinterpretInt64(), 2),
     // Binary
     makeBinary(module, BinaryenAdd(), 1),
     makeBinary(module, BinaryenSub(), 4),
diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
index 7a1366888..e878984a3 100644
--- a/test/example/c-api-kitchen-sink.txt
+++ b/test/example/c-api-kitchen-sink.txt
@@ -125,7 +125,7 @@ BinaryenFloat64: 4
           (i32.const -10)
         )
         (f64.reinterpret/i64
-          (i32.const -10)
+          (i64.const -22)
         )
         (i32.add
           (i32.const -10)
diff --git a/test/reg_switch.wast b/test/reg_switch.wast
index b53d45f54..60a294af0 100644
--- a/test/reg_switch.wast
+++ b/test/reg_switch.wast
@@ -2,10 +2,10 @@
   (memory 0)
   (func $0
     (if
-      (nop)
+      (i32.const 0)
       (block $A
         (br_table $A
-          (nop)
+          (i32.const 0)
         )
       )
     )
diff --git a/test/reg_switch.wast.fromBinary b/test/reg_switch.wast.fromBinary
index 89a2fe061..7ea792099 100644
--- a/test/reg_switch.wast.fromBinary
+++ b/test/reg_switch.wast.fromBinary
@@ -3,11 +3,11 @@
   (type $0 (func))
   (func $0 (type $0)
     (if
-      (nop)
+      (i32.const 0)
       (block $label$0
         (block $label$1
           (br_table $label$1
-            (nop)
+            (i32.const 0)
           )
         )
       )
-- 
cgit v1.2.3