Commit bb7b893d authored by Alessandro Ghedini's avatar Alessandro Ghedini Committed by Rich Salz
Browse files

Fix travis 1.0.2 builds 



Disable -Wshadow error when building with GCC
Add support for linu-x86_64-clang debug; this is needed for Travis CI.
Disable linux-clang and mingw debug builds on Travis CI; not supported.
Fix Travis email notifications config

Signed-off-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent cc1cdc5d

.travis.yml

+8 −4
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ matrix: 
          compiler: i686-w64-mingw32-gcc

        - os: osx

          compiler: x86_64-w64-mingw32-gcc

        - compiler: i686-w64-mingw32-gcc

          env: CONFIG_OPTS="-d --strict-warnings"

        - compiler: x86_64-w64-mingw32-gcc

          env: CONFIG_OPTS="-d --strict-warnings"



before_script:

    - if [ "$CC" == i686-w64-mingw32-gcc ]; then
@@ -35,6 +39,9 @@ before_script: 
          export CROSS_COMPILE=${CC%%gcc}; unset CC;

          ./Configure mingw64 $CONFIG_OPTS;

      else

          if [ "$CC" == gcc ]; then

              export CONFIG_OPTS="$CONFIG_OPTS -Wno-error=shadow";

          fi;

          ./config $CONFIG_OPTS;

      fi
@@ -43,8 +50,5 @@ script: 
    - if [ -z "$CROSS_COMPILE" ]; then make test; fi



notifications:

    recipient:

        - openssl-commits@openssl.org

    email:

        on_success: change

        on_failure: always
 
        - openssl-commits@openssl.org

Configure

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ my %table=( 
"linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",

"linux-x86_64-clang",	"clang: -m64 -DL_ENDIAN -O3 -Wall -Wextra $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",

"debug-linux-x86_64-clang",	"clang: -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -Wall -Wextra $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",

"linux-x86_64-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",

"linux-x32",	"gcc:-mx32 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",

"linux64-s390x",	"gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",