Commit d24ecca0 authored by Daniel Tuulik's avatar Daniel Tuulik
Browse files

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
parent 77253e75
...@@ -17,6 +17,12 @@ test-qgen-ada: ...@@ -17,6 +17,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
@python3 test.py test-qgen-c $(TEST_CASES) @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: test-ada:
@python3 test.py test-ada $(TEST_CASES) @python3 test.py test-ada $(TEST_CASES)
......
...@@ -9,8 +9,8 @@ O=0 ...@@ -9,8 +9,8 @@ O=0
TESTQGEN_PARSE=../testqgen.py test-qgen-parse TESTQGEN_PARSE=../testqgen.py test-qgen-parse
TESTQGEN_ADA=../testqgen.py test-qgen-ada TESTQGEN_ADA=../testqgen.py test-qgen-ada
TESTQGEN_C=../testqgen.py test-qgen-c TESTQGEN_C=../testqgen.py test-qgen-c
TESTQGEN_ADA_ASN=../testqgen.py test-qgen-ada-asn TESTQGEN_GT_ADA=../testqgen.py test-qgen-gt-ada
TESTQGEN_C_ASN=../testqgen.py test-qgen-c-asn TESTQGEN_GT_C=../testqgen.py test-qgen-gt-c
clean: clean:
rm -rf *.adb *.ads *.pyc runSpark.sh spark.idx *.o *.so *.ali gnat.cfg \ rm -rf *.adb *.ads *.pyc runSpark.sh spark.idx *.o *.so *.ali gnat.cfg \
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(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 test-ada: challenge.ali dataview-uniq.o | test_ada.o
$(GNATBIND) -n challenge.ali $(GNATBIND) -n challenge.ali
$(GNATLINK) -o test_ada test_ada.o challenge.ali -lgnat -lm $(GNATLINK) -o test_ada test_ada.o challenge.ali -lgnat -lm
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
......
...@@ -20,6 +20,12 @@ test-qgen-ada: ...@@ -20,6 +20,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(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: test-qgen-ada-asn:
$(TESTQGEN_ADA_ASN) $(ROOT_MODEL) $(TESTQGEN_ADA_ASN) $(ROOT_MODEL)
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(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 test-ada: orchestrator.ali dataview-uniq.o | test_ada.o
$(GNATBIND) -n orchestrator.ali $(GNATBIND) -n orchestrator.ali
$(GNATLINK) -o test_ada test_ada.o orchestrator.ali -lgnat $(GNATLINK) -o test_ada test_ada.o orchestrator.ali -lgnat
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
......
...@@ -22,6 +22,12 @@ test-qgen-ada: ...@@ -22,6 +22,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
$(OPENGEODE) --toAda myfunction.pr system_structure.pr 2>&1 | sort | diff expected - || exit 0 $(OPENGEODE) --toAda myfunction.pr system_structure.pr 2>&1 | sort | diff expected - || exit 0
......
...@@ -22,6 +22,12 @@ test-qgen-ada: ...@@ -22,6 +22,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
$(OPENGEODE) --toAda myfunction.pr system_structure.pr 2>&1 | sort | diff expected - || exit 0 $(OPENGEODE) --toAda myfunction.pr system_structure.pr 2>&1 | sort | diff expected - || exit 0
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(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 test-ada: controlflow.ali dataview-uniq.o | test_ada.o
$(GNATBIND) -n controlflow.ali $(GNATBIND) -n controlflow.ali
$(GNATLINK) test_ada.o controlflow.ali -lgnat -lm -o test_ada $(GNATLINK) test_ada.o controlflow.ali -lgnat -lm -o test_ada
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(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 test-ada: orchestrator.ali dataview-uniq.o | test_ada.o
$(GNATBIND) -n orchestrator.ali $(GNATBIND) -n orchestrator.ali
$(GNATLINK) -o test_ada test_ada.o orchestrator.ali -lgnat $(GNATLINK) -o test_ada test_ada.o orchestrator.ali -lgnat
......
include ../shared.mk include ../shared.mk
ROOT_MODEL=system_structure.pr
all: test-ada test-llvm all: test-ada test-llvm
edit: edit:
...@@ -8,6 +10,21 @@ edit: ...@@ -8,6 +10,21 @@ edit:
test-parse: test-parse:
$(OPENGEODE) f1.pr system_structure.pr --check $(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 test-ada: f1.ali
cp check.ada check.adb && cp ris.ada ris.ads && \ cp check.ada check.adb && cp ris.ada ris.ads && \
$(GNATMAKE) -O$(O) -gnat2012 -g -fprofile-arcs -ftest-coverage check.adb && \ $(GNATMAKE) -O$(O) -gnat2012 -g -fprofile-arcs -ftest-coverage check.adb && \
......
include ../shared.mk include ../shared.mk
ROOT_MODEL=system_structure.pr
all: test-ada test-llvm all: test-ada test-llvm
edit: edit:
$(OPENGEODE) orchestrator.pr system_structure.pr $(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: test-parse:
$(OPENGEODE) orchestrator.pr system_structure.pr --check || echo [OK] $(OPENGEODE) orchestrator.pr system_structure.pr --check || echo [OK]
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
./check_simulation.sh && rm -rf testsc_simu ./check_simulation.sh && rm -rf testsc_simu
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
$(OPENGEODE) demodevicedsap.pr --toAda $(OPENGEODE) demodevicedsap.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(TESTQGEN_C) $(ROOT_MODEL)
test-qgen-gt-ada:
$(TESTQGEN_GT_ADA) $(ROOT_MODEL)
test-qgen-gt-c:
$(TESTQGEN_GT_C) $(ROOT_MODEL)
test-ada: test-ada:
$(OPENGEODE) test.pr --toAda $(OPENGEODE) test.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(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 test-ada: og.ali dataview-uniq.o | test_ada.o
$(GNATBIND) -n og.ali $(GNATBIND) -n og.ali
$(GNATLINK) -o test_ada test_ada.o og.ali -lgnat $(GNATLINK) -o test_ada test_ada.o og.ali -lgnat
......
...@@ -19,6 +19,12 @@ test-qgen-ada: ...@@ -19,6 +19,12 @@ test-qgen-ada:
test-qgen-c: test-qgen-c:
$(TESTQGEN_C) $(ROOT_MODEL) $(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 test-ada: challenge.ali dataview-uniq.o | test_ada.o
$(GNATBIND) -n challenge.ali $(GNATBIND) -n challenge.ali
$(GNATLINK) -o test_ada test_ada.o challenge.ali -lgnat -lm $(GNATLINK) -o test_ada test_ada.o challenge.ali -lgnat -lm
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment