[wasm2c] Add spec tests; fix update-spec-tests.py (#891)

`update-spec-tests.py` now will update the tests in the
`test/wasm2c/spec` directory.

6 files changed, 41 insertions, 13 deletions

diff --git a/test/update-spec-tests.py b/test/update-spec-tests.py
index 070ae77d..8de5147a 100755
--- a/test/update-spec-tests.py
+++ b/test/update-spec-tests.py
@@ -25,6 +25,9 @@ TEST_DIR = SCRIPT_DIR
 REPO_ROOT_DIR = os.path.dirname(SCRIPT_DIR)
 TESTSUITE_DIR = os.path.join(REPO_ROOT_DIR, 'third_party', 'testsuite')
 SPEC_TEST_DIR = os.path.join(TEST_DIR, 'spec')
+WASM2C_SPEC_TEST_DIR = os.path.join(TEST_DIR, 'wasm2c', 'spec')
+
+options = None
 
 
 def GetFilesWithExtension(src_dir, want_ext):
@@ -36,17 +39,11 @@ def GetFilesWithExtension(src_dir, want_ext):
   return result
 
 
-def main(args):
-  parser = argparse.ArgumentParser()
-  parser.add_argument('-v', '--verbose', help='print more diagnotic messages.',
-                      action='store_true')
-  options = parser.parse_args(args)
-
-  testsuite_tests = set(GetFilesWithExtension(TESTSUITE_DIR, '.wast'))
-  spec_tests = set(GetFilesWithExtension(SPEC_TEST_DIR, '.txt'))
+def ProcessDir(dirname, testsuite_tests, tool):
+  spec_tests = set(GetFilesWithExtension(dirname, '.txt'))
 
   for removed_test_name in spec_tests - testsuite_tests:
-    test_filename = os.path.join(SPEC_TEST_DIR, removed_test_name + '.txt')
+    test_filename = os.path.join(dirname, removed_test_name + '.txt')
     if options.verbose:
       print('Removing %s' % test_filename)
     os.remove(test_filename)
@@ -55,15 +52,25 @@ def main(args):
     wast_filename = os.path.join(
         os.path.relpath(TESTSUITE_DIR, REPO_ROOT_DIR),
         added_test_name + '.wast')
-    test_filename = os.path.join(SPEC_TEST_DIR, added_test_name + '.txt')
+    test_filename = os.path.join(dirname, added_test_name + '.txt')
     if options.verbose:
       print('Adding %s' % test_filename)
     with open(test_filename, 'w') as f:
-      if added_test_name.endswith('.fail'):
-        f.write(';;; ERROR: 1\n')
-      f.write(';;; TOOL: run-interp-spec\n')
+      f.write(';;; TOOL: %s\n' % tool)
       f.write(';;; STDIN_FILE: %s\n' % wast_filename)
 
+
+def main(args):
+  parser = argparse.ArgumentParser()
+  parser.add_argument('-v', '--verbose', help='print more diagnotic messages.',
+                      action='store_true')
+  global options
+  options = parser.parse_args(args)
+
+  testsuite_tests = set(GetFilesWithExtension(TESTSUITE_DIR, '.wast'))
+  ProcessDir(SPEC_TEST_DIR, testsuite_tests, 'run-interp-spec')
+  ProcessDir(WASM2C_SPEC_TEST_DIR, testsuite_tests, 'run-spec-wasm2c')
+
   return 0
 
 
diff --git a/test/wasm2c/spec/custom.txt b/test/wasm2c/spec/custom.txt
new file mode 100644
index 00000000..5edf0836
--- /dev/null
+++ b/test/wasm2c/spec/custom.txt
@@ -0,0 +1,5 @@
+;;; TOOL: run-spec-wasm2c
+;;; STDIN_FILE: third_party/testsuite/custom.wast
+(;; STDOUT ;;;
+0/0 tests passed.
+;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/data.txt b/test/wasm2c/spec/data.txt
new file mode 100644
index 00000000..c53ba239
--- /dev/null
+++ b/test/wasm2c/spec/data.txt
@@ -0,0 +1,5 @@
+;;; TOOL: run-spec-wasm2c
+;;; STDIN_FILE: third_party/testsuite/data.wast
+(;; STDOUT ;;;
+0/0 tests passed.
+;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/elem.txt b/test/wasm2c/spec/elem.txt
new file mode 100644
index 00000000..ecd021af
--- /dev/null
+++ b/test/wasm2c/spec/elem.txt
@@ -0,0 +1,5 @@
+;;; TOOL: run-spec-wasm2c
+;;; STDIN_FILE: third_party/testsuite/elem.wast
+(;; STDOUT ;;;
+13/13 tests passed.
+;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/memory_grow.txt b/test/wasm2c/spec/memory_grow.txt
new file mode 100644
index 00000000..83853780
--- /dev/null
+++ b/test/wasm2c/spec/memory_grow.txt
@@ -0,0 +1,5 @@
+;;; TOOL: run-spec-wasm2c
+;;; STDIN_FILE: third_party/testsuite/memory_grow.wast
+(;; STDOUT ;;;
+45/45 tests passed.
+;;; STDOUT ;;)
diff --git a/wasm2c/wasm-rt-impl.c b/wasm2c/wasm-rt-impl.c
index a3f25760..2404d7d1 100644
--- a/wasm2c/wasm-rt-impl.c
+++ b/wasm2c/wasm-rt-impl.c
@@ -106,6 +106,7 @@ uint32_t wasm_rt_grow_memory(wasm_rt_memory_t* memory, uint32_t delta) {
   memory->pages = new_pages;
   memory->size = new_pages * PAGE_SIZE;
   memory->data = realloc(memory->data, memory->size);
+  memset(memory->data + old_pages * PAGE_SIZE, 0, delta * PAGE_SIZE);
   return old_pages;
 }