Merge pull request #60 from haya14busa/test-js-py

Run tests with generated python and javascript vimlparser

Author: mattn

.travis.yml

@@ -16,7 +16,7 @@ matrix:
       - MAKE_TARGET=test
     - env:
       - VIM_VERSION=installed
-      - MAKE_TARGET="clean_compiled check"
+      - MAKE_TARGET="clean_compiled check js/test py/test"
 
 install:
   - |

Makefile

@@ -19,3 +19,9 @@ check: all
 
 test:
 	test/run.sh
+
+js/test: js/vimlparser.js
+	test/run_command.sh node js/vimlparser.js
+
+py/test: py/vimlparser.py
+	test/run_command.sh python py/vimlparser.py

js/vimlfunc.js

@@ -20,9 +20,13 @@ function main() {
     var r = new StringReader(viml_readfile(fpath));
     var p = new VimLParser(neovim);
     var c = new Compiler();
-    var lines = c.compile(p.parse(r))
-    for (var i in lines) {
-        process.stdout.write(lines[i] + "\n");
+    try {
+        var lines = c.compile(p.parse(r));
+        for (var i in lines) {
+            process.stdout.write(lines[i] + "\n");
+        }
+    } catch (e) {
+        process.stdout.write(e + '\n');
     }
 }
 

js/vimlparser.js

@@ -20,9 +20,13 @@ function main() {
     var r = new StringReader(viml_readfile(fpath));
     var p = new VimLParser(neovim);
     var c = new Compiler();
-    var lines = c.compile(p.parse(r))
-    for (var i in lines) {
-        process.stdout.write(lines[i] + "\n");
+    try {
+        var lines = c.compile(p.parse(r));
+        for (var i in lines) {
+            process.stdout.write(lines[i] + "\n");
+        }
+    } catch (e) {
+        process.stdout.write(e + '\n');
     }
 }
 

py/vimlfunc.py

@@ -7,12 +7,16 @@
 
 def main():
     use_neovim = sys.argv[1] == '--neovim'
-     
+
     r = StringReader(viml_readfile(sys.argv[-1]))
     p = VimLParser(use_neovim)
     c = Compiler()
-    for line in c.compile(p.parse(r)):
-        print(line)
+    try:
+        for line in c.compile(p.parse(r)):
+            print(line)
+    except VimLParserException as e:
+        print(e)
+        sys.exit(1)
 
 class VimLParserException(Exception):
     pass

py/vimlparser.py

@@ -7,12 +7,16 @@
 
 def main():
     use_neovim = sys.argv[1] == '--neovim'
-     
+
     r = StringReader(viml_readfile(sys.argv[-1]))
     p = VimLParser(use_neovim)
     c = Compiler()
-    for line in c.compile(p.parse(r)):
-        print(line)
+    try:
+        for line in c.compile(p.parse(r)):
+            print(line)
+    except VimLParserException as e:
+        print(e)
+        sys.exit(1)
 
 class VimLParserException(Exception):
     pass

test/run_command.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+  echo "USAGE: ./test/run_command.sh <vimlparser command>"
+  echo "  Example: ./test/run_command.sh python3 py/vimlparser.py"
+  exit 1
+fi
+vimlparser=$@
+
+exit_status=0
+
+test_file() {
+  local vimfile=$1
+  local base=$(basename "$vimfile" ".vim")
+  local okfile="test/${base}.ok"
+  local outfile="test/${base}.out"
+
+  if [[ -f "test/${base}.skip" ]]; then
+    return
+  fi
+
+  local neovim=""
+  if [[ $vimfile =~ "test_neo" ]]; then
+    neovim="--neovim"
+  fi
+
+  rm -f ${outfile}
+
+  ${vimlparser} ${neovim} ${vimfile} &> ${outfile}
+
+  diffout=$(diff -u ${outfile} ${okfile})
+  if [ -n "$diffout" ]; then
+    exit_status=1
+    echo "${diffout}"
+  fi
+}
+
+for f in test/test*.vim; do
+  test_file ${f}
+done
+
+exit $exit_status