Adjusted binary paths for macOS.

edaa-org · Jul 30, 2024 · eb97510 · eb97510
1 parent 793111f
commit eb97510
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -21,8 +21,12 @@ jobs:
       jobs: ${{ needs.UnitTestingParams.outputs.python_jobs }}
       apt: ghdl-mcode
       brew: ghdl
-      ubuntu_before_script: which ghdl
-      macos_before_script: which ghdl
+      ubuntu_before_script: |
+        which ghdl
+        ghdl version
+      macos_before_script: |
+        which ghdl
+        ghdl version
 #      ubuntu_before_script: sudo install -m 755 tests/mock/ghdl /usr/local/bin
       requirements: "-r tests/unit/requirements.txt"
       unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}

diff --git a/tests/unit/GHDL.py b/tests/unit/GHDL.py
@@ -33,13 +33,15 @@
 from pathlib              import Path
 from unittest             import TestCase
 
+from pyTooling.Platform   import CurrentPlatform
+
 from pyEDAA.CLITool.GHDL  import GHDL
 from .                    import Helper
 
 
 class GHDLTestcases(TestCase, Helper):
-	_libraryDirectoryPath = Path(os_getenv("GHDL_PREFIX", default="/usr/lib/ghdl")).resolve()
-	_binaryDirectoryPath = (Path(os_getenv("GHDL_PREFIX", default="/usr/lib/ghdl")) / "../../bin").resolve()
+	_libraryDirectoryPath = (Path(os_getenv("GHDL_PREFIX", default="/usr/lib/ghdl" if not CurrentPlatform.IsNativeMacOS else "/opt/homebrew/lib/ghdl")) / "../").resolve()
+	_binaryDirectoryPath = (Path(os_getenv("GHDL_PREFIX", default="/usr/lib/ghdl" if not CurrentPlatform.IsNativeMacOS else "/opt/homebrew/lib/ghdl")) / "../../bin").resolve()
 
 
 class CommonOptions(GHDLTestcases):