Using GHDL_PREFIX.

edaa-org · Aug 4, 2024 · e8d0544 · e8d0544
1 parent 10ca572
commit e8d0544
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -25,21 +25,32 @@ jobs:
       ubuntu_before_script: |
         which ghdl
         ghdl version
-      macos_before_script: |
+        echo "GHDL_PREFIX=/usr/lib/x86_64-linux-gnu/ >> $GITHUB_ENV"
+        echo "GHDL_PREFIX=/usr/lib/x86_64-linux-gnu/" >> $GITHUB_ENV
+      macos_arm_before_script: |
         which ghdl
         ghdl version
         echo $(brew --prefix llvm@15)
         export DYLD_LIBRARY_PATH=$(brew --prefix llvm@15)/lib
         echo -$DYLD_LIBRARY_PATH-
         echo "DYLD_LIBRARY_PATH=$(brew --prefix llvm@15)/lib" >> $GITHUB_ENV
+        echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl) >> $GITHUB_ENV"
+        echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl)" >> $GITHUB_ENV
+        ls -lAh "$(realpath $(dirname $(which ghdl))/../lib)"
         echo "----"
         ls $(brew --prefix llvm@15)/lib
       mingw64_before_script: |
         which ghdl
         ghdl version
+        echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl) >> $GITHUB_ENV"
+        echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl)" >> $GITHUB_ENV
+#        ls -lAh "$(realpath $(dirname $(which ghdl))/../lib)"
       ucrt64_before_script: |
         which ghdl
         ghdl version
+        echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl) >> $GITHUB_ENV"
+        echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl)" >> $GITHUB_ENV
+#        ls -lAh "$(realpath $(dirname $(which ghdl))/../lib)"
 #      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,15 +33,12 @@
 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" 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()
+	_binaryDirectoryPath = (Path(os_getenv("GHDL_PREFIX", default="/usr/lib/ghdl")) / "../../bin").resolve()
 
 
 class CommonOptions(GHDLTestcases):