GitHub CI: Cleanup the Toooba test jobs

A workaround for elf_to_hex on Ubuntu is no longer needed
B-Lang-org · Feb 25, 2024 · e8aeb85 · e8aeb85
1 parent e1e1f80
commit e8aeb85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml
@@ -246,11 +246,10 @@ jobs:
         run: |
           export PATH=$PWD/../bsc/inst/bin:$PATH
 
-          cd ../Toooba/Tests/elf_to_hex
+          # Workaround limitation in the Makefile for Homebrew on older macOS
+          export CPATH=/usr/local/include/libelf
 
-          make CPATH=/usr/local/include/libelf
-
-          cd ../../builds/RV64ACDFIMSU_Toooba_bluesim/
+          cd ../Toooba/builds/RV64ACDFIMSU_Toooba_bluesim/
 
           # Workaround bugs in the regression script
           #make isa_tests | tee isa_tests.log

diff --git a/.github/workflows/build-and-test-ubuntu.yml b/.github/workflows/build-and-test-ubuntu.yml
@@ -229,17 +229,7 @@ jobs:
         run: |
           export PATH=$PWD/../bsc/inst/bin:$PATH
 
-          cd ../Toooba/Tests/elf_to_hex
-
-          # Workaround a build failure on Ubuntu 22.04
-          REL=$(lsb_release -rs | tr -d .)
-          if [ $REL -lt 2204 ]; then
-              make
-          else
-              gcc -g  -o elf_to_hex  elf_to_hex.c  -lelf -mcmodel=medium
-          fi
-
-          cd ../../builds/RV64ACDFIMSU_Toooba_bluesim/
+          cd ../Toooba/builds/RV64ACDFIMSU_Toooba_bluesim/
 
           # Workaround bugs in the regression script
           #make isa_tests | tee isa_tests.log