summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Green <green@moxielogic.com>2019-10-14 11:02:02 -0400
committerAnthony Green <green@moxielogic.com>2019-10-14 11:02:02 -0400
commit9b7314426be1d551c3f8bbe942ac5159cfdfe338 (patch)
treeb7455160d41a68db435a0c7764075481a5229501
parent1022c0cda9ced70773e3f09e46653c311dfc3fff (diff)
downloadlibffi-9b7314426be1d551c3f8bbe942ac5159cfdfe338.tar.gz
Split arm builds into multiple travis jobs so we don'texceed timeout
-rw-r--r--.travis.yml6
-rw-r--r--testsuite/lib/libffi.exp8
2 files changed, 12 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 1ba533f..44e5076 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,11 @@ matrix:
- os: osx
env: HOST=arm-apple-darwin
- os: linux
- env: HOST=arm32v7-linux-gnu
+ env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0"
- os: linux
- env: HOST=s390x-linux-gnu
+ env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O2"
+ - os: linux
+ env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O2 -fomit-frame-pointer"
- os: linux
compiler: gcc
env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp
index b3f684c..b007477 100644
--- a/testsuite/lib/libffi.exp
+++ b/testsuite/lib/libffi.exp
@@ -493,6 +493,14 @@ proc run-many-tests { testcases extra_flags } {
}
}
+ # Override optimizations if provided by LIBFFI_TEST_OPTIMIZATION
+ # environment variable.
+ if [info exists env(LIBFFI_TEST_OPTIMIZATION)] {
+ set optimizations { "$env(LIBFFI_TEST_OPTIMIZATION)" }
+ }
+
+ info exists env(LD_LIBRARY_PATH)
+
set targetabis { "" }
if [string match $compiler_vendor "gnu"] {
if [libffi_feature_test "#ifdef __i386__"] {