Add QGen tests for C and Ada to all Makefiles

tests/regression/Makefile

@@ -11,6 +11,12 @@ test-parse:
 test-qgen-parse:
 	@python3 test.py test-qgen-parse $(TEST_CASES)
 
+test-qgen-ada:
+	@python3 test.py test-qgen-ada $(TEST_CASES)
+
+test-qgen-c:
+	@python3 test.py test-qgen-c $(TEST_CASES)
+
 test-ada:
 	@python3 test.py test-ada $(TEST_CASES)
 

tests/regression/test-aggregation1/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/test-aggregation2/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-asn1constants/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-battery/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-branchcoverage/Makefile

@@ -14,7 +14,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:
 	$(OPENGEODE) --toAda myfunction.pr system_structure.pr 2>&1 | sort | diff expected - || exit 0

tests/regression/test-branchcoverage2/Makefile

@@ -14,7 +14,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:
 	$(OPENGEODE) --toAda myfunction.pr system_structure.pr 2>&1 | sort | diff expected - || exit 0

tests/regression/test-choice/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-controlflow/Makefile

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

tests/regression/test-debug/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-eds1/Makefile

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

tests/regression/test-eds2/Makefile

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

tests/regression/test-emptysequence/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-emptysequence2/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-equal/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-exitnested/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/test-expressions/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-forloop/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-ibk/Makefile

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

tests/regression/test-ibk2/Makefile

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