Merge branch 'topic/fix_json_gen' into 'master'

Fix `json_gen` after changes in the VSS API

Closes #231

See merge request eng/ide/VSS!309

.gitlab-ci.yml

@@ -121,7 +121,8 @@ build_and_test_dev:
 
       # Build VSS and run tests
       ( eval $(anod printenv --sandbox-dir /it/wave gnatall) ;\
-        make COVERAGE_MODE=gcov build-libs-static check ;\
+        make COVERAGE_MODE=gcov build-libs-static check misc ;\
+        make -C testsuite/json_schema ;\
         ENABLE_GCOV=y gcovr --print-summary --cobertura gcov.xml )
       make clean
 

testsuite/common/test_support.ads

@@ -27,7 +27,7 @@
 --        Test_Support.Run_Testsuite (Testsuite'Access, "test of Boolean");
 --     end Test_Driver;
 --
---  Call of Assert with False contition terminates execution of the testcase.
+--  Call of Assert with False condition terminates execution of the testcase.
 --  Testcase execution can be terminated by the call of Fail subprogram, it
 --  means that testcase fails, or by the call of Skip subprogram, it means
 --  that testcase is not executed.

testsuite/json_schema/Makefile

@@ -0,0 +1,10 @@
+DIRECTORIES := dap lsp
+JSON_GEN := $(abspath ../../.objs/tools/gen_json)
+GOT_FILE := $(shell mktemp -t got-XXXXXX.txt)
+
+all: $(foreach dir,$(DIRECTORIES),$(dir)-run)
+
+%-run:
+	cd $*; $(JSON_GEN) `cat cmd.txt` > $(GOT_FILE)
+	diff -u $*/expected.txt $(GOT_FILE)
+	rm -f $(GOT_FILE)

testsuite/json_schema/dap/cmd.txt

@@ -0,0 +1,4 @@
+--root-package DAP.Tools
+--enum-package Enum
+--header-file header.adt
+debugAdapterProtocol.json