Workaround for Travis OS X dbg exe corruption

This commit is contained in:
Geza Lore 2020-06-25 14:12:09 +01:00
parent d4a411db6c
commit 0cdc2e038c
2 changed files with 24 additions and 7 deletions

View File

@ -38,8 +38,14 @@ if [ "$TRAVIS_BUILD_STAGE_NAME" = "build" ]; then
autoconf autoconf
./configure --enable-longtests --enable-ccwarn ./configure --enable-longtests --enable-ccwarn
make -j "$NPROC" make -j "$NPROC"
file bin/verilator_bin if [ "$TRAVIS_OS_NAME" = "osx" ]; then
file bin/verilator_bin_dbg file bin/verilator_bin
file bin/verilator_bin_dbg
md5 bin/verilator_bin
md5 bin/verilator_bin_dbg
stat bin/verilator_bin
stat bin/verilator_bin_dbg
fi
else else
nodist/code_coverage --stages 1-2 nodist/code_coverage --stages 1-2
fi fi
@ -51,6 +57,17 @@ elif [ "$TRAVIS_BUILD_STAGE_NAME" = "test" ]; then
export VERILATOR_TEST_NO_GDB=1 # Pain to get GDB to work on OS X export VERILATOR_TEST_NO_GDB=1 # Pain to get GDB to work on OS X
export VERILATOR_TEST_NO_GPROF=1 # Apple Clang has no -pg export VERILATOR_TEST_NO_GPROF=1 # Apple Clang has no -pg
# export PATH="/Applications/gtkwave.app/Contents/Resources/bin:$PATH" # fst2vcd # export PATH="/Applications/gtkwave.app/Contents/Resources/bin:$PATH" # fst2vcd
file bin/verilator_bin
file bin/verilator_bin_dbg
md5 bin/verilator_bin
md5 bin/verilator_bin_dbg
stat bin/verilator_bin
stat bin/verilator_bin_dbg
# For some reason, the dbg exe is corrupted by this point ('file' reports
# it as data rather than a Mach-O). Unclear if this is an OS X issue or
# one for Travis. Remove the file and re-link...
rm bin/verilator_bin_dbg
make -j "$NPROC"
fi fi
# Run the specified test # Run the specified test

View File

@ -128,11 +128,11 @@ AC_ARG_ENABLE([prec11],
AC_SUBST(CFG_WITH_PREC11) AC_SUBST(CFG_WITH_PREC11)
AC_MSG_RESULT($CFG_WITH_PREC11) AC_MSG_RESULT($CFG_WITH_PREC11)
# Compiler flags (set them to non-empty string to avoid configure defaults) # Compiler flags (ensure they are not empty to avoid configure defaults)
CFLAGS=" " CFLAGS+=" "
CPPFLAGS=" " CPPFLAGS+=" "
CXXFLAGS=" " CXXFLAGS+=" "
LDFLAGS=" " LDFLAGS+=" "
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC