diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-12-19 17:50:50 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-12-19 17:50:50 +1000 |
| commit | 3ce3866389a82837aff169fe3643393367d724a2 (patch) | |
| tree | c19bd6b771e913aa8b01a5d5ff4560d402ffbc75 /.travis.yml | |
| parent | 31b59078c8245a4ee7f7fa4e6ea98bba7f9a29a5 (diff) | |
| download | openssl-3ce3866389a82837aff169fe3643393367d724a2.zip openssl-3ce3866389a82837aff169fe3643393367d724a2.tar.gz openssl-3ce3866389a82837aff169fe3643393367d724a2.tar.bz2 | |
Fix travis timeout by excluding arm64 gcc -fsanitize=address build
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10639)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 3b2e0fd..86de07e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ compiler: env: - CONFIG_OPTS="" DESTDIR="_install" + # Note: This CONFIG_OPTS entry must match the value in the exclude: table below that contains env: CONFIG_OPTS , otherwise it will not find a match. - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-rc5 enable-md2 -fsanitize=address" LSAN_OPTIONS="report_objects=1" - CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" GENERATE="yes" CPPFLAGS="-ansi" @@ -150,6 +151,14 @@ matrix: compiler: gcc - arch: arm64 os: osx + # arm64 times out when using -fsanitize=address + # The amd64 build should be sufficient to test this. + # Note: the env line must exactly match the env line from the build + # matrix above which contains the `-fsanitize=address` option. + # TODO: come up with a better way of doing this that is less error prone. + - arch: arm64 + env: CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-rc5 enable-md2 -fsanitize=address" LSAN_OPTIONS="report_objects=1" + before_script: - env |