diff --git a/src/secp256k1/.travis.yml b/src/secp256k1/.travis.yml index 222dbfb31c..e881111492 100644 --- a/src/secp256k1/.travis.yml +++ b/src/secp256k1/.travis.yml @@ -1,61 +1,68 @@ language: c sudo: false addons: apt: - packages: libgmp-dev + packages: + - libgmp-dev + - ninja-build compiler: - clang - gcc env: global: - FIELD=auto BIGNUM=auto SCALAR=auto ENDOMORPHISM=no STATICPRECOMPUTATION=yes ASM=no BUILD=check EXTRAFLAGS= HOST= ECDH=no RECOVERY=no SCHNORR=yes EXPERIMENTAL=no JNI=no matrix: - SCALAR=32bit RECOVERY=yes - SCALAR=32bit FIELD=32bit ECDH=yes EXPERIMENTAL=yes - SCALAR=64bit - FIELD=64bit RECOVERY=yes - FIELD=64bit ENDOMORPHISM=yes - FIELD=64bit ENDOMORPHISM=yes ECDH=yes EXPERIMENTAL=yes - FIELD=64bit ASM=x86_64 - FIELD=64bit ENDOMORPHISM=yes ASM=x86_64 - FIELD=32bit ENDOMORPHISM=yes - BIGNUM=no - BIGNUM=no ENDOMORPHISM=yes RECOVERY=yes EXPERIMENTAL=yes - BIGNUM=no STATICPRECOMPUTATION=no - BUILD=distcheck - EXTRAFLAGS=CPPFLAGS=-DDETERMINISTIC - EXTRAFLAGS=CFLAGS=-O0 - BUILD=check-java JNI=yes ECDH=yes EXPERIMENTAL=yes - SCHNORR=no matrix: fast_finish: true include: - compiler: clang env: HOST=i686-linux-gnu ENDOMORPHISM=yes addons: apt: packages: - gcc-multilib - libgmp-dev:i386 + - ninja-build:i386 - compiler: clang env: HOST=i686-linux-gnu addons: apt: packages: - gcc-multilib + - ninja-build:i386 - compiler: gcc env: HOST=i686-linux-gnu ENDOMORPHISM=yes addons: apt: packages: - gcc-multilib + - ninja-build:i386 - compiler: gcc env: HOST=i686-linux-gnu addons: apt: packages: - gcc-multilib - libgmp-dev:i386 + - ninja-build:i386 script: - ./travis/build_autotools.sh + - ./travis/build_cmake.sh os: linux diff --git a/src/secp256k1/travis/build_cmake.sh b/src/secp256k1/travis/build_cmake.sh new file mode 100755 index 0000000000..62baea283e --- /dev/null +++ b/src/secp256k1/travis/build_cmake.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +export LC_ALL=C + +set -ex + +if [ "x$HOST" = "xi686-linux-gnu" ]; then + TOOLCHAIN_FILE="-DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/Linux32.cmake" +fi + +if [ "x$BIGNUM" = "xno" ]; then + USE_GMP="-DGMP_LIBRARY=OFF" +fi + +mkdir -p buildcmake +pushd buildcmake + +cmake -GNinja .. \ + -DSECP256K1_ECMULT_STATIC_PRECOMPUTATION=$STATICPRECOMPUTATION \ + -DSECP256K1_ENABLE_MODULE_ECDH=$ECDH \ + -DSECP256K1_ENABLE_MODULE_RECOVERY=$RECOVERY \ + -DSECP256K1_ENABLE_MODULE_SCHNORR=$SCHNORR \ + -DSECP256K1_ENABLE_JNI=$JNI \ + -DUSE_ASM_X86_64=$ASM \ + $USE_GMP \ + $TOOLCHAIN_FILE \ + +ninja check-secp256k1 + +popd