Add QGen tests using ASN1SCC types to OG regression suite

The usual test is now using ASN1SCC generated data types
Added -gt tests that use QGen generated data types

tests/regression/Makefile

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

tests/regression/shared.mk

@@ -9,8 +9,8 @@ O=0
 TESTQGEN_PARSE=../testqgen.py test-qgen-parse
 TESTQGEN_ADA=../testqgen.py test-qgen-ada
 TESTQGEN_C=../testqgen.py test-qgen-c
-TESTQGEN_ADA_ASN=../testqgen.py test-qgen-ada-asn
-TESTQGEN_C_ASN=../testqgen.py test-qgen-c-asn
+TESTQGEN_GT_ADA=../testqgen.py test-qgen-gt-ada
+TESTQGEN_GT_C=../testqgen.py test-qgen-gt-c
 
 clean:
 	rm -rf *.adb *.ads *.pyc runSpark.sh spark.idx *.o *.so *.ali gnat.cfg \

tests/regression/test-aggregation1/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: challenge.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n challenge.ali
 	$(GNATLINK) -o test_ada  test_ada.o challenge.ali -lgnat -lm

tests/regression/test-aggregation2/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: 
 	$(OPENGEODE) og.pr --toAda
 	mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn

tests/regression/test-aggregation3/Makefile

@@ -20,6 +20,12 @@ test-qgen-ada:
 
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
+
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
 	
 test-qgen-ada-asn:
 	$(TESTQGEN_ADA_ASN) $(ROOT_MODEL)

tests/regression/test-asn1constants/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: orchestrator.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n orchestrator.ali
 	$(GNATLINK) -o test_ada test_ada.o orchestrator.ali -lgnat

tests/regression/test-battery/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: 
 	$(OPENGEODE) og.pr --toAda
 	mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn

tests/regression/test-branchcoverage/Makefile

@@ -22,6 +22,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada:
 	$(OPENGEODE) --toAda myfunction.pr system_structure.pr 2>&1 | sort | diff expected - || exit 0
 

tests/regression/test-branchcoverage2/Makefile

@@ -22,6 +22,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada:
 	$(OPENGEODE) --toAda myfunction.pr system_structure.pr 2>&1 | sort | diff expected - || exit 0
 

tests/regression/test-choice/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: 
 	$(OPENGEODE) og.pr --toAda
 	mono $(ASN1SCC) -Ada  -typePrefix asn1Scc -equal dataview.asn

tests/regression/test-controlflow/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: controlflow.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n controlflow.ali
 	$(GNATLINK) test_ada.o controlflow.ali -lgnat -lm -o test_ada

tests/regression/test-debug/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: orchestrator.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n orchestrator.ali
 	$(GNATLINK) -o test_ada test_ada.o orchestrator.ali -lgnat

tests/regression/test-demo2callers/Makefile

 include ../shared.mk
 
+ROOT_MODEL=system_structure.pr
+
 all: test-ada test-llvm
 
 edit:
@@ -8,6 +10,21 @@ edit:
 test-parse:
 	$(OPENGEODE) f1.pr system_structure.pr --check
 
+test-qgen-parse:
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
+
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: f1.ali
 	cp check.ada check.adb && cp ris.ada ris.ads && \
 	$(GNATMAKE) -O$(O) -gnat2012 -g -fprofile-arcs -ftest-coverage check.adb && \

tests/regression/test-demoopengeode/Makefile

 include ../shared.mk
 
+ROOT_MODEL=system_structure.pr
+
 all: test-ada test-llvm
 
 edit:
 	$(OPENGEODE) orchestrator.pr system_structure.pr
 
+test-qgen-parse:
+	$(TESTQGEN_PARSE) $(ROOT_MODEL)
+
+test-qgen-ada:
+	$(TESTQGEN_ADA) $(ROOT_MODEL)
+
+test-qgen-c:
+	$(TESTQGEN_C) $(ROOT_MODEL)
+
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-parse:
 	$(OPENGEODE) orchestrator.pr system_structure.pr --check || echo [OK]
 

tests/regression/test-eds1/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: 
 	./check_simulation.sh && rm -rf testsc_simu
 

tests/regression/test-eds2/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: 
 	$(OPENGEODE) demodevicedsap.pr --toAda
 	mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn

tests/regression/test-emptysequence/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: 
 	$(OPENGEODE) og.pr --toAda
 	mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn 

tests/regression/test-emptysequence2/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: 
 	$(OPENGEODE) test.pr --toAda
 	mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn

tests/regression/test-equal/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: og.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n og.ali
 	$(GNATLINK) -o test_ada test_ada.o og.ali -lgnat

tests/regression/test-exitnested/Makefile

@@ -19,6 +19,12 @@ test-qgen-ada:
 test-qgen-c:
 	$(TESTQGEN_C) $(ROOT_MODEL)
 
+test-qgen-gt-ada:
+	$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
+
+test-qgen-gt-c:
+	$(TESTQGEN_GT_C) $(ROOT_MODEL)
+
 test-ada: challenge.ali dataview-uniq.o | test_ada.o
 	$(GNATBIND) -n challenge.ali
 	$(GNATLINK) -o test_ada  test_ada.o challenge.ali -lgnat -lm