Skip to content

Commit

Permalink
Moved to 2008 version of ghdl - requires 0.33, expect travis fail
Browse files Browse the repository at this point in the history
  • Loading branch information
jandecaluwe committed Mar 1, 2016
1 parent 755d2b8 commit 62aa73f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions myhdl/conversion/_verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
sim = namedtuple('sim', 'name hdl analyze elaborate simulate skiplines skipchars ignore')


def registerSimulator(name=None, hdl=None, analyze=None, elaborate=None, simulate=None,
def registerSimulator(name=None, hdl=None, analyze=None, elaborate=None, simulate=None,
skiplines=None, skipchars=None, ignore=None):
if not isinstance(name, str) or (name.strip() == ""):
raise ValueError("Invalid simulator name")
Expand All @@ -41,8 +41,8 @@ def registerSimulator(name=None, hdl=None, analyze=None, elaborate=None, simulat
registerSimulator(
name="ghdl",
hdl="VHDL",
analyze="ghdl -a --workdir=work pck_myhdl_%(version)s.vhd %(topname)s.vhd",
elaborate="ghdl -e --workdir=work -o %(unitname)s %(topname)s",
analyze="ghdl -a --std=08 --workdir=work pck_myhdl_%(version)s.vhd %(topname)s.vhd",
elaborate="ghdl -e --std=08 --workdir=work %(unitname)s",
simulate="ghdl -r --workdir=work %(unitname)s"
)

Expand Down Expand Up @@ -96,7 +96,7 @@ class _VerificationClass(object):
__slots__ = ("simulator", "_analyzeOnly")

def __init__(self, analyzeOnly=False):
self.simulator = None
self.simulator = None
self._analyzeOnly = analyzeOnly


Expand Down Expand Up @@ -178,7 +178,7 @@ def __call__(self, func, *args, **kwargs):
if ret != 0:
print("Elaboration failed", file=sys.stderr)
return ret

g = tempfile.TemporaryFile(mode='w+t')
#print(simulate)
ret = subprocess.call(simulate, stdout=g, shell=True)
Expand Down

2 comments on commit 62aa73f

@cfelton
Copy link
Member

@cfelton cfelton commented on 62aa73f Mar 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is is possible to use 0.33 in travis? If not should we disable the GHDL tests until it is?

@jandecaluwe
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cfelton A unit test should first fail ;-) (and travis cannot be tested locally). I only started the exercise when I judged it should be possible to get it to work. Not straightforward, as it requires custom install. But in the mean time it works.

The purpose is to see if improved VHDL 2008 support in ghdl may be useful to ongoing efforts.

Please sign in to comment.