Add QGen tests for C and Ada to all Makefiles

tests/regression/test-sequenceof/Makefile

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

tests/regression/test-sequenceof2/Makefile

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

tests/regression/test-simu/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: 
 	mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn

tests/regression/test-standalone/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-stateexclusion/Makefile

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

tests/regression/test-strings/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-substrings/Makefile

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

tests/regression/test-ternary/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-typecheck/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: 
 	@echo 'Nothing to test - test-parse must retun errors'

tests/regression/test-types/Makefile

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

tests/regression/test1/Makefile

@@ -9,7 +9,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/test10/Makefile

@@ -11,7 +11,13 @@ test-parse:
 	$(OPENGEODE) challenge.pr system_structure.pr --check
 
 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: challenge.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n challenge.ali

tests/regression/test11/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/test12/Makefile

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

tests/regression/test2/Makefile

@@ -9,7 +9,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/test3/Makefile

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

tests/regression/test4/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
 

tests/regression/test5/Makefile

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

tests/regression/test6/Makefile

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

tests/regression/test7/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