Run Java tests as part of test suite.

2 files changed, 18 insertions, 8 deletions

diff --git a/meson_test.py b/meson_test.py
index 9d18979..68d5386 100755
--- a/meson_test.py
+++ b/meson_test.py
@@ -41,15 +41,18 @@ def write_log(logfile, test_name, result_str, stdo, stde):
 
 def run_single_test(wrap, test):
     global tests_failed
-    if test.is_cross:
-        if test.exe_runner is None:
-            # 'Can not run test on cross compiled executable 
-            # because there is no execute wrapper.
-            cmd = None
-        else:
-            cmd = [test.exe_runner, test.fname]
+    if test.fname.endswith('.jar'):
+        cmd = ['java', '-jar', test.fname]
     else:
-        cmd = [test.fname]
+        if test.is_cross:
+            if test.exe_runner is None:
+                # Can not run test on cross compiled executable 
+                # because there is no execute wrapper.
+                cmd = None
+            else:
+                cmd = [test.exe_runner, test.fname]
+        else:
+            cmd = [test.fname]
     if cmd is None:
         res = 'SKIP'
         duration = 0.0
diff --git a/run_tests.py b/run_tests.py
index 11a6c0e..702987e 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -154,6 +154,10 @@ def run_tests():
         frameworktests = gather_tests('test cases/frameworks')
     else:
         frameworktests = []
+    if shutil.which('javac'):
+        javatests = gather_tests('test cases/java')
+    else:
+        javatests = []
     if not environment.is_windows():
         objctests = gather_tests('test cases/objc')
     else:
@@ -185,6 +189,9 @@ def run_tests():
         [run_and_log(logfile, t) for t in frameworktests]
     else:
         print('\nNo framework tests on this platform.\n')
+    if len(javatests) > 0:
+        print('\nRunning java tests.\n')
+        [run_and_log(logfile, t) for t in javatests]
     if len(objctests) > 0:
         print('\nRunning extra language tests.\n')
         [run_and_log(logfile, t) for t in objctests]