Commit 0deeb9c2 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras

CircleCI 2.0 saga: Typo, missed the quotes. No DB tests, so this should pass...

parent bf86672a
...@@ -7,10 +7,10 @@ jobs: ...@@ -7,10 +7,10 @@ jobs:
- restore_cache: - restore_cache:
key: docker-{{ checksum "Dockerfile" }} key: docker-{{ checksum "Dockerfile" }}
- run: - run:
command: if [[ -e ~/docker/image.tar ]]; then docker load --input ~/docker/image.tar; else docker build -t dmt . && { mkdir -p ~/docker; docker save asn1scc > ~/docker/image.tar ; } ; fi command: if [[ -e ~/docker/image.tar ]]; then docker load --input ~/docker/image.tar; else docker build -t dmt . && { mkdir -p ~/docker; docker save dmt > ~/docker/image.tar ; } ; fi
- save_cache: - save_cache:
key: docker-{{ checksum "Dockerfile" }} key: docker-{{ checksum "Dockerfile" }}
paths: paths:
- ~/docker - ~/docker
- run: - run:
command: docker run -it -v /home/ttsiod/GitHub/DataModellingTools:/root/tests dmt bash -c cd /root/tests ; LANG=C LC_ALL=C PATH=$PATH:/asn1scc make command: docker run -it -v /home/ttsiod/GitHub/DataModellingTools:/root/tests dmt bash -c 'cd /root/tests ; LANG=C LC_ALL=C PATH=$PATH:/asn1scc make'
...@@ -47,7 +47,7 @@ def OnStartup(unused_modelingLanguage: str, asnFiles: List[str], outputDir: str, ...@@ -47,7 +47,7 @@ def OnStartup(unused_modelingLanguage: str, asnFiles: List[str], outputDir: str,
if not asn1SccPath: if not asn1SccPath:
panic("ASN1SCC seems to be missing from your system (asn1.exe not found in PATH).\n") # pragma: no cover panic("ASN1SCC seems to be missing from your system (asn1.exe not found in PATH).\n") # pragma: no cover
# allow externally-defined flags when calling the asn1 compiler (e.g. to set word size based on target) # allow externally-defined flags when calling the asn1 compiler (e.g. to set word size based on target)
extraFlags = os.getenv ("ASN1SCC_FLAGS") or "" extraFlags = os.getenv("ASN1SCC_FLAGS") or ""
os.system( os.system(
("mono " if sys.platform.startswith('linux') else "") + ("mono " if sys.platform.startswith('linux') else "") +
"\"{}\" -typePrefix asn1Scc -Ada {} -uPER -o \"".format(asn1SccPath, extraFlags) + "\"{}\" -typePrefix asn1Scc -Ada {} -uPER -o \"".format(asn1SccPath, extraFlags) +
......
...@@ -476,13 +476,13 @@ def DumpTypeDumper( ...@@ -476,13 +476,13 @@ def DumpTypeDumper(
for idx, child in enumerate(node._members): for idx, child in enumerate(node._members):
if isinstance(node, AsnChoice): if isinstance(node, AsnChoice):
if variableName.startswith("path[i]"): if variableName.startswith("path[i]"):
lines.append(codeIndent + 'path.Reset(state)') lines.append(codeIndent + 'path.Reset(state)') # pragma: nocover
lines.append( lines.append(
codeIndent + 'if %s.kind.Get() == DV.%s:' % ( codeIndent + 'if %s.kind.Get() == DV.%s:' % (
variableName, variableName,
CleanNameAsPythonWants(child[2]))) CleanNameAsPythonWants(child[2])))
if variableName.startswith("path[i]"): if variableName.startswith("path[i]"):
lines.append(codeIndent + ' path.Reset(state)') lines.append(codeIndent + ' path.Reset(state)') # pragma: nocover
sep = ": " sep = ": "
elif idx > 0: elif idx > 0:
# Separate fields with comas: # Separate fields with comas:
......
...@@ -205,7 +205,7 @@ types). This used to cover Dumpable C/Ada Types and OG headers.''' ...@@ -205,7 +205,7 @@ types). This used to cover Dumpable C/Ada Types and OG headers.'''
outputDir = commonPy.configMT.outputDir outputDir = commonPy.configMT.outputDir
asn1SccPath = spawn.find_executable('asn1.exe') asn1SccPath = spawn.find_executable('asn1.exe')
# allow externally-defined flags when calling the asn1 compiler (e.g. to set word size based on target) # allow externally-defined flags when calling the asn1 compiler (e.g. to set word size based on target)
extraFlags = os.getenv ("ASN1SCC_FLAGS") or "" extraFlags = os.getenv("ASN1SCC_FLAGS") or ""
if asnFile is not None: if asnFile is not None:
if not asn1SccPath: if not asn1SccPath:
panic("ASN1SCC seems not installed on your system (asn1.exe not found in PATH).\n") # pragma: no cover panic("ASN1SCC seems not installed on your system (asn1.exe not found in PATH).\n") # pragma: no cover
......
Markdown is supported
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