Merge branch 'topic/avoid-jq' into 'master'

Avoid dependency on jq in testing

See merge request eng/ide/ada_language_server!1208

Author: eliericha

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-    "ada.projectFile": "gnat/lsp_server.gpr"
+    "ada.projectFile": "gnat/lsp_server.gpr",
+    "python.analysis.extraPaths": [
+        "testsuite"
+    ]
 }

testsuite/drivers/__init__.py

@@ -89,6 +89,12 @@ def run_and_log(self, cmd, **kwargs):
             'status': process.status,
             'output': Log(process.out)})
 
+        cwd = kwargs.get("cwd", os.getcwd())
+        self.result.log += f"Run: cd {cwd}; {process.command_line_image()}\n"
+        self.result.log += f"Status code: {process.status}\n"
+        self.result.log += "Output:\n"
+        self.result.log += process.out
+
         if self.result.out is None:
             self.result.out = process.out
         else:

testsuite/drivers/shell.py

@@ -1,6 +1,5 @@
-import os.path
-
 from e3.testsuite.result import TestStatus
+from e3.testsuite.process import check_call
 
 from drivers import ALSTestDriver
 
@@ -16,10 +15,13 @@ def run(self, previous_values, slot):
         if self.should_skip():
             return False
 
-        index = os.path.abspath(os.path.join(self.test_env["test_dir"], "index.txt"))
-        test_sh = os.path.join(self.env.repo_base, 'testsuite', 'shell', 'test.sh')
-        p = self.run_and_log([test_sh, self.env.repo_base], cwd=self.env.working_dir)
-        self.result.out += p.out
+        # This takes care of failing the test in case the return code is
+        # non-zero
+        check_call(
+            self,
+            [self.working_dir("test.sh"), self.env.repo_base],
+            parse_shebang=True
+        )
 
-        self.result.set_status(TestStatus.PASS if p.status == 0 else TestStatus.FAIL)
+        self.result.set_status(TestStatus.PASS)
         self.push_result()

testsuite/run-tests

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 import testsuite
 import os
-import yaml
 import sys
 
 if __name__ == '__main__':
@@ -16,7 +15,9 @@ if __name__ == '__main__':
         if status not in ('PASS', 'XFAIL'):
             all_ok = False
             print("--- {} : {} ---".format(k, status))
-            print(entry.load().out)
+            test_result = entry.load()
+            print(f"Output:\n{test_result.out}")
+            print(f"Log:\n{test_result.log}")
 
     if all_ok:
         print("SUCCESS")

testsuite/shell/get-extension-settings.py

@@ -0,0 +1,6 @@
+import sys
+import json
+
+pkg = json.load(sys.stdin)
+settings = pkg["contributes"]["configuration"][0]["properties"].keys()
+print("\n".join(settings))

testsuite/shell/test.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
-jq -r '.contributes.configuration[].properties|keys[]' < $1/integration/vscode/ada/package.json | grep ^ada. > pkg.txt
+python3 get-extension-settings.py < $1/integration/vscode/ada/package.json | grep ^ada. | sort > pkg.txt
 grep '^## ' $1/doc/settings.md |sed -e 's/.../ada./' | sort > doc.txt
 diff -u pkg.txt doc.txt