Add QGen tests for C and Ada to all Makefiles

tests/regression/test-ibk3/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) node.pr system_structure.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) node.pr system_structure.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: node.ali
 

tests/regression/test-instance/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr system_structure.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr system_structure.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: og.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n og.ali

tests/regression/test-iterators/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=orchestrator.pr
+
 ARCH := $(shell getconf LONG_BIT)
 all: test-ada test-llvm
 
@@ -16,7 +17,13 @@ test-parse:
 	$(OPENGEODE) orchestrator.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) orchestrator.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada:
 	[ $(ARCH) == 64 ] && EXTRAFLAG="--target=x86_64-linux" ; \

tests/regression/test-llvm/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) orchestrator.pr system_structure.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) orchestrator.pr system_structure.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: orchestrator.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n orchestrator.ali

tests/regression/test-math/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) expressions.pr system_structure.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) expressions.pr system_structure.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: expressions.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n expressions.ali

tests/regression/test-nestedpriority/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) challenge.pr system_structure.pr --check 2>&1 | grep ERROR | wc | grep "1       9      61" && echo OK
 
 test-qgen-parse:
-	$(TESTQGEN) challenge.pr system_structure.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: test-parse
 

tests/regression/test-nocif/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) orchestrator.pr system_structure.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) orchestrator.pr system_structure.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: orchestrator.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n orchestrator.ali

tests/regression/test-nocif2/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=DemoDeviceDSAP_fixed.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) DemoDeviceDSAP_fixed.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) DemoDeviceDSAP_fixed.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) DemoDeviceDSAP_fixed.pr --toAda

tests/regression/test-noparam/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) og.pr --toAda

tests/regression/test-operators/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) operators.pr system_structure.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) operators.pr system_structure.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: operators.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n operators.ali

tests/regression/test-optionalfield/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) og.pr --toAda

tests/regression/test-procedure/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) og.pr --toAda || :

tests/regression/test-processfpar1/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) og.pr --toAda

tests/regression/test-processfpar2/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada:
 	$(OPENGEODE) og.pr --toAda

tests/regression/test-provided1/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) og.pr --toAda

tests/regression/test-provided2/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) og.pr --toAda

tests/regression/test-provided3/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) og.pr --toAda

tests/regression/test-pus/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) flight.pr system_structure.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) flight.pr system_structure.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: flight.ali
 

tests/regression/test-recursion/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: dataview-uniq.o test_ada.o
 	$(OPENGEODE) og.pr --toAda

tests/regression/test-save/Makefile

 include ../shared.mk
 
-ROOT_MODEL=system_structure.pr
+ROOT_MODEL=og.pr
 
 all: test-ada test-llvm
 
@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) og.pr --check
 
 test-qgen-parse:
-	$(TESTQGEN) og.pr
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
 
 test-ada: 
 	$(OPENGEODE) og.pr --toAda