diff options
| author | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2020-12-29 00:26:19 +0100 |
|---|---|---|
| committer | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2020-12-29 00:26:19 +0100 |
| commit | 9e991938ae1f0ad188ce33f73c51b1c9d4354589 (patch) | |
| tree | 07ed9a95592f0627d2784c9c77a3be94fa471094 | |
| parent | 3e6c7275d2c48e4aa56a6dc1cec536250c1e95fd (diff) | |
| download | ghdl-9e991938ae1f0ad188ce33f73c51b1c9d4354589.tar.gz ghdl-9e991938ae1f0ad188ce33f73c51b1c9d4354589.tar.bz2 ghdl-9e991938ae1f0ad188ce33f73c51b1c9d4354589.zip | |
Made path to VHDL files relative to the testcase.
| -rw-r--r-- | doc/using/pyGHDL/pyutils.rst | 4 | ||||
| -rw-r--r-- | pyGHDL/dom/Misc.py | 2 | ||||
| -rw-r--r-- | pyGHDL/libghdl/version.py | 2 | ||||
| -rw-r--r-- | testsuite/pyunit/dom/SimpleEntity.py | 9 | ||||
| -rw-r--r-- | testsuite/pyunit/libghdl/Initialize.py | 3 |
5 files changed, 10 insertions, 10 deletions
diff --git a/doc/using/pyGHDL/pyutils.rst b/doc/using/pyGHDL/pyutils.rst deleted file mode 100644 index 5efe078b8..000000000 --- a/doc/using/pyGHDL/pyutils.rst +++ /dev/null @@ -1,4 +0,0 @@ -libghdl.pyutils -=============== - -.. automodule:: libghdl.pyutils diff --git a/pyGHDL/dom/Misc.py b/pyGHDL/dom/Misc.py index f8c3d5b73..8493028de 100644 --- a/pyGHDL/dom/Misc.py +++ b/pyGHDL/dom/Misc.py @@ -32,6 +32,8 @@ class Design(VHDLModel_Design): errorout_console.Install_Handler() libghdl.set_option(b"--std=08") + + # Finish initialization. This will load the standard package. # if libghdl.analyze_init_status() != 0: # raise LibGHDLException("Error initializing 'libghdl'.") diff --git a/pyGHDL/libghdl/version.py b/pyGHDL/libghdl/version.py index 6c7936ab3..fcc6d13d8 100644 --- a/pyGHDL/libghdl/version.py +++ b/pyGHDL/libghdl/version.py @@ -1 +1 @@ -__version__ = "1.0.0-dev" +__version__ = "1.0-dev" diff --git a/testsuite/pyunit/dom/SimpleEntity.py b/testsuite/pyunit/dom/SimpleEntity.py index a8caf9e6f..2f65c9813 100644 --- a/testsuite/pyunit/dom/SimpleEntity.py +++ b/testsuite/pyunit/dom/SimpleEntity.py @@ -11,7 +11,8 @@ if __name__ == "__main__": class SimpleEntity(TestCase): - _path: Path = Path("testsuite/pyunit/SimpleEntity.vhdl") + _root = Path(__file__).resolve().parent.parent + _filename : Path = _root / "SimpleEntity.vhdl" def test_Design(self): design = Design() @@ -23,14 +24,14 @@ class SimpleEntity(TestCase): def test_Document(self): design = Design() - document = Document(self._path) + document = Document(self._filename) design.Documents.append(document) self.assertTrue(len(design.Documents) == 1) def test_Entity(self): design = Design() - document = Document(self._path) + document = Document(self._filename) design.Documents.append(document) self.assertEqual(len(design.Documents[0].Entities), 1) @@ -38,7 +39,7 @@ class SimpleEntity(TestCase): def test_Architecture(self): design = Design() - document = Document(self._path) + document = Document(self._filename) design.Documents.append(document) self.assertEqual(len(design.Documents[0].Architectures), 1) diff --git a/testsuite/pyunit/libghdl/Initialize.py b/testsuite/pyunit/libghdl/Initialize.py index fb7196e7c..90692760c 100644 --- a/testsuite/pyunit/libghdl/Initialize.py +++ b/testsuite/pyunit/libghdl/Initialize.py @@ -16,7 +16,8 @@ if __name__ == "__main__": class Instantiate(TestCase): - _filename : Path = Path("testsuite/pyunit/SimpleEntity.vhdl") + _root = Path(__file__).resolve().parent.parent + _filename : Path = _root / "SimpleEntity.vhdl" @staticmethod def getIdentifier(node): |