WIP: Experiment with using lit as a test runner

Author: sbc100

.gitignore

@@ -15,6 +15,8 @@
 # Ignore only the root node_modules, but not any further down the path
 /node_modules/
 
+/tests/out/
+
 # Python coverage tool output
 .coverage
 .coverage.*

requirements-dev.txt

@@ -7,4 +7,6 @@
 flake8==3.9.0
 flake8-unused-arguments==0.0.6
 coverage==5.5
-sphinx==2.4.4
+sphinx==2.4.4
+filecheck==0.0.17
+lit==0.11.0.post1

tests/em-lit

@@ -0,0 +1,19 @@
+import os
+from lit.main import main
+
+# A simple wrapper around `lit` test running.   Loosely based on
+# llvm's llvm-lit script
+
+script_dir = os.path.dirname(os.path.abspath(__file__))
+
+builtin_parameters = {
+    'config_map': {
+        os.path.normcase(os.path.join(script_dir, 'lit/lit.cfg.py')):
+        os.path.normcase(os.path.join(script_dir, 'lit/lit.site.cfg.py'))
+    }
+}
+
+print(builtin_parameters)
+
+if __name__ == '__main__':
+    main(builtin_parameters)

tests/lit/lit.cfg.py

@@ -0,0 +1,26 @@
+import lit.formats
+import re
+
+config.name = "Emscripten lit tests"
+config.test_format = lit.formats.ShTest()
+
+config.suffixes = ['.cpp', '.c']
+
+config.test_source_root = config.src_root + '/tests/lit'
+config.test_exec_root = config.src_root + '/tests/out'
+
+# Replace all Binaryen tools with their absolute paths
+#bin_dir = os.path.join(config.binaryen_build_root, 'bin')
+#for tool_file in os.listdir(bin_dir):
+    #tool_path = config.binaryen_build_root + '/bin/' + tool_file
+    #tool = tool_file[:-4] if tool_file.endswith('.exe') else tool_file
+for tool in ('emcc', 'em++', 'emar'):
+    config.substitutions.append((re.escape(tool), config.src_root + '/' + tool))
+
+# Also make the `not` and `foreach` commands available
+for tool in ('not', 'foreach'):
+    tool_file = config.src_root + '/tests/lit/' + tool + '.py'
+    python = sys.executable.replace('\\', '/')
+    config.substitutions.append((tool, python + ' ' + tool_file))
+
+print(config.substitutions)

tests/lit/lit.site.cfg.py

@@ -0,0 +1,7 @@
+import os
+
+script_dir = os.path.dirname(os.path.abspath(__file__))
+config.src_root = os.path.dirname(os.path.dirname(script_dir))
+
+lit_config.load_config(
+    config, os.path.join(config.src_root, 'tests', 'lit', 'lit.cfg.py'))

tests/other/test_tsearch.c tests/lit/test_tsearch.ctests/other/test_tsearch.c renamed to tests/lit/test_tsearch.c

@@ -1,3 +1,18 @@
+// RUN: emcc %s -o %t.js
+// RUN: node %t.js | filecheck %s
+
+//      CHECK:     0
+// CHECK-NEXT:     1
+// CHECK-NEXT:     2
+// CHECK-NEXT:     3
+// CHECK-NEXT:     4
+// CHECK-NEXT:     5
+// CHECK-NEXT:     6
+// CHECK-NEXT:     7
+// CHECK-NEXT:     8
+// CHECK-NEXT:     9
+// CHECK-NEXT:    10
+
 #define _GNU_SOURCE
 
 #include <search.h>