diff options
| author | Anthony Green <green@moxielogic.com> | 2019-10-15 12:14:43 -0400 |
|---|---|---|
| committer | Anthony Green <green@moxielogic.com> | 2019-10-15 12:14:43 -0400 |
| commit | 0b51db7df9f3b00bc33a00858486bb8f32b38157 (patch) | |
| tree | 145f85ec9864a19b20a1950e181cb0f62ddc1272 | |
| parent | 1ecbf62601e65001eba99e89056988cc4592aed7 (diff) | |
| download | libffi-0b51db7df9f3b00bc33a00858486bb8f32b38157.tar.gz | |
More tweaks
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/install.sh | 2 | ||||
| -rw-r--r-- | testsuite/lib/libffi.exp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 867dad2..75afdc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ before_install: - if test x"$MEVAL" != x; then eval ${MEVAL}; fi install: - - ./.travis/install.sh + - travis_wait 30 ./.travis/install.sh script: - if ! test x"$MEVAL" = x; then eval ${MEVAL}; fi diff --git a/.travis/install.sh b/.travis/install.sh index 93a5c6f..6e9c321 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -2,7 +2,7 @@ set -x if [[ $TRAVIS_OS_NAME != 'linux' ]]; then - brew update + brew update > brew-update.log 2>&1 # fix an issue with libtool on travis by reinstalling it brew uninstall libtool; brew install libtool dejagnu; diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp index 5d519e2..ab3a666 100644 --- a/testsuite/lib/libffi.exp +++ b/testsuite/lib/libffi.exp @@ -268,7 +268,7 @@ proc libffi-dg-test { prog do_what extra_tool_flags } { proc libffi-dg-prune { target_triplet text } { # We get this with some qemu emulated systems (eg. ppc64le-linux-gnu) - regsub -all "/bin/stty: 'standard input': unable to perform all requested operations" $text "" text + regsub -all "(^|\n)\[^\n\]*unable to perform all requested operations" $text "" text } proc libffi-init { args } { |