Skip to content

Commit 5f9ff7e

Browse files
committed
GitHub CI: Cleanup the Toooba test jobs
A workaround for elf_to_hex on Ubuntu is no longer needed
1 parent ff2315e commit 5f9ff7e

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

.github/workflows/build-and-test-macos.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,10 @@ jobs:
246246
run: |
247247
export PATH=$PWD/../bsc/inst/bin:$PATH
248248
249-
cd ../Toooba/Tests/elf_to_hex
249+
# Workaround limitation in the Makefile for Homebrew on older macOS
250+
export CPATH=/usr/local/include/libelf
250251
251-
make CPATH=/usr/local/include/libelf
252-
253-
cd ../../builds/RV64ACDFIMSU_Toooba_bluesim/
252+
cd ../Toooba/builds/RV64ACDFIMSU_Toooba_bluesim/
254253
255254
# Workaround bugs in the regression script
256255
#make isa_tests | tee isa_tests.log

.github/workflows/build-and-test-ubuntu.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -229,17 +229,7 @@ jobs:
229229
run: |
230230
export PATH=$PWD/../bsc/inst/bin:$PATH
231231
232-
cd ../Toooba/Tests/elf_to_hex
233-
234-
# Workaround a build failure on Ubuntu 22.04
235-
REL=$(lsb_release -rs | tr -d .)
236-
if [ $REL -lt 2204 ]; then
237-
make
238-
else
239-
gcc -g -o elf_to_hex elf_to_hex.c -lelf -mcmodel=medium
240-
fi
241-
242-
cd ../../builds/RV64ACDFIMSU_Toooba_bluesim/
232+
cd ../Toooba/builds/RV64ACDFIMSU_Toooba_bluesim/
243233
244234
# Workaround bugs in the regression script
245235
#make isa_tests | tee isa_tests.log

0 commit comments

Comments
 (0)