diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-05-26 17:08:03 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-05-26 20:00:35 +0200 |
| commit | 4de3fe5381b647de4b93436c5138ad16e575056c (patch) | |
| tree | 466a1bc4cd0be175bb86484ab343976d7868c023 /.travis.yml | |
| parent | c8c250333cd254ab3f4d709ebc5ed86a7c065721 (diff) | |
Try to work around ubuntu gcc-5 ubsan build failure
[extended tests]
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6360)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 4affefd5f0..7092953402 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,16 +93,16 @@ matrix: - os: linux compiler: clang env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument" - #- os: linux - # addons: - # apt: - # packages: - # - gcc-5 - # - g++-5 - # sources: - # - ubuntu-toolchain-r-test - # compiler: gcc-5 - # env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0 + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: UBUNTU_GCC_HACK="yes" EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0 - os: linux addons: apt: @@ -141,6 +141,10 @@ before_script: srcdir=.; top=.; fi + - if [ -n "$UBUNTU_GCC_HACK" ]; then + $CC -dumpspecs | sed "s/--push-state//g; s/--pop-state/--as-needed/g" > gcc-specs.txt; + CC="$CC -specs=gcc-specs.txt"; + fi - if [ "$CC" = i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; |