Get wasm2asm building again (#1107)

* Get wasm2asm building again

Updates CMakeLists.txt to have wasm2asm built by default, updates
wasm2asm.h to account for recent interface changes, and restores
JSPrinter functionality.

* Implement splice for array values

* Clean up wasm2asm testing

* Print semicolons after statements in blocks

* Cleanups and semicolons for condition arms

* Prettify semicolon emission

1 files changed, 5 insertions, 2 deletions

diff --git a/scripts/test/support.py b/scripts/test/support.py
index 5d791d155..97dd3d1c4 100755
--- a/scripts/test/support.py
+++ b/scripts/test/support.py
@@ -147,7 +147,8 @@ def split_wast(wast):
   return ret
 
 
-def run_command(cmd, expected_status=0, stderr=None, expected_err=None):
+def run_command(cmd, expected_status=0, stderr=None,
+                expected_err=None, err_contains=False):
   if expected_err is not None:
     assert stderr == subprocess.PIPE or stderr is None,\
         "Can't redirect stderr if using expected_err"
@@ -157,7 +158,9 @@ def run_command(cmd, expected_status=0, stderr=None, expected_err=None):
   out, err = proc.communicate()
   if proc.returncode != expected_status:
     raise Exception(('run_command failed', err))
-  if expected_err is not None and err != expected_err:
+  err_correct = expected_err is None or \
+      (expected_err in err if err_contains else expected_err == err)
+  if not err_correct:
     raise Exception(('run_command unexpected stderr',
                      "expected '%s', actual '%s'" % (expected_err, err)))
   return out