diff options
| author | Anthony Green <green@moxielogic.com> | 2019-11-11 10:41:55 -0500 |
|---|---|---|
| committer | Anthony Green <green@moxielogic.com> | 2019-11-11 10:41:55 -0500 |
| commit | b8766c815a1326621b0213d228bbb36cf7f9123f (patch) | |
| tree | ba6acac406b0696068e167f52786ebf1959229ec | |
| parent | f4fa79541d0114a20e142d3b711821e5c868819c (diff) | |
| download | libffi-b8766c815a1326621b0213d228bbb36cf7f9123f.tar.gz | |
Try again
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | .travis/install.sh | 4 | ||||
| -rw-r--r-- | .travis/wine-sim.exp | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index e14f1b4..d6e404c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ language: cpp matrix: include: - os: linux - env: HOST=i686-w64-mingw32 MEVAL='export CC="i686-w64-mingw32-gcc-win32" && CXX="i686-w64-mingw32-g++-win32"' LIBFFI_TEST_OPTIMIZATION=-O2 RUNTESTFLAGS="-v -v -v --target_board wine-sim" DEJAGNU="$TRAVIS_BUILD_DIR/.travis/site.exp" + env: HOST=i686-w64-mingw32 MEVAL='export CC="i686-w64-mingw32-gcc-win32" && CXX="i686-w64-mingw32-g++-win32"' LIBFFI_TEST_OPTIMIZATION=-O2 RUNTESTFLAGS="--target_board wine-sim" DEJAGNU="$TRAVIS_BUILD_DIR/.travis/site.exp" CONFIGURE_OPTIONS="--disable-shared" before_install: - if test x"$MEVAL" != x; then eval ${MEVAL}; fi @@ -16,4 +16,4 @@ install: script: - if ! test x"$MEVAL" = x; then eval ${MEVAL}; fi - - ./.travis/build.sh + - travis_wait 45 ./.travis/build.sh diff --git a/.travis/install.sh b/.travis/install.sh index e6a8152..23ec699 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -22,8 +22,8 @@ else sudo apt-get install -y --allow-unauthenticated moxielogic-moxie-elf-gcc moxielogic-moxie-elf-gcc-c++ moxielogic-moxie-elf-gcc-libstdc++ moxielogic-moxie-elf-gdb-sim ;; i686-w64-mingw32) - sudo apt-get install gcc-mingw-w64-i686 binutils-mingw-w64-i686 wine libsm6:i386; - rm -rf testsuite/libffi.bhaible testsuite/libffi.go testsuite/libffi.complex testsuite/libffi.call/[e-z]*.c + sudo apt-get install gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 wine libsm6:i386; + ;; rm -rf testsuite/libffi.bhaible testsuite/libffi.go testsuite/libffi.complex testsuite/libffi.call/[e-z]*.c ;; esac case $HOST in diff --git a/.travis/wine-sim.exp b/.travis/wine-sim.exp index 62c83a7..4710b01 100644 --- a/.travis/wine-sim.exp +++ b/.travis/wine-sim.exp @@ -16,11 +16,13 @@ # along with DejaGnu; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -load_lib "standard.exp" - # This is a list of toolchains that are supported on this board. set_board_info target_install {i686-w64-mingw32} +# Load the generic configuration for this board. This will define a basic set +# of routines needed by the tool to communicate with the board. +load_generic_config "sim" + set_board_info sim "wineconsole" set_board_info simflags "--backend=curses" set_board_info is_simulator 1 |