From: Jonas Nick <jonasd.nick@gmail.com>
Date: Tue, 15 Sep 2020 17:48:06 +0000 (+0000)
Subject: Merge #782: Check if variable=yes instead of if var is set in travis.sh
X-Git-Url: https://repo.jachan.dev/secp256k1.git/commitdiff_plain/4ad408faf321508b31a1d4e292cc8ff2b5b3f2d3

Merge #782: Check if variable=yes instead of if var is set in travis.sh

34debf7a6d36bbd9a52e68e079ddfc446faf5bef Modify .travis.yml to explictly pass no in env vars instead of setting to nothing (Elichai Turkel)
ef37761feed0172baa03dd94c842f1547bdf3016 Change travis.sh to check if variables are equal to yes instead of not-empty. Before this, setting `VALGRIND=wat` was considered as true, and to make it evaluate as false you had to unset the variable `VALGRIND=` but not it checks if `VALGRIND=yes` and if it's not `yes` then it's evaluated to false (Elichai Turkel)

Pull request description:

ACKs for top commit:
  real-or-random:
    ACK 34debf7a6d36bbd9a52e68e079ddfc446faf5bef
  jonasnick:
    ACK 34debf7a6d36bbd9a52e68e079ddfc446faf5bef

Tree-SHA512: 91becfbc9cb7587ee55b2bceb604ea0aed8860990d63a5f414b11db92180c090ea8bcc048c2fb67a094e892138e3be46f00562bf78b7c3369232457289cde447
---

4ad408faf321508b31a1d4e292cc8ff2b5b3f2d3
diff --cc .travis.yml
index e1a88c4,c247a11..14f3caf
--- a/.travis.yml
+++ b/.travis.yml
@@@ -17,23 -17,23 +17,23 @@@ compiler
    - gcc
  env:
    global:
 -    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ECMULTGENPRECISION=auto  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  RECOVERY=no  EXPERIMENTAL=no CTIMETEST=yes BENCH=yes ITERS=2
 +    - WIDEMUL=auto  BIGNUM=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ECMULTGENPRECISION=auto  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  RECOVERY=no SCHNORRSIG=no EXPERIMENTAL=no CTIMETEST=yes BENCH=yes ITERS=2
    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
 +    - WIDEMUL=int64   RECOVERY=yes
 +    - WIDEMUL=int64   ECDH=yes  EXPERIMENTAL=yes SCHNORRSIG=yes
 +    - WIDEMUL=int64   ENDOMORPHISM=yes
 +    - WIDEMUL=int128
 +    - WIDEMUL=int128  RECOVERY=yes EXPERIMENTAL=yes SCHNORRSIG=yes
 +    - WIDEMUL=int128  ENDOMORPHISM=yes
 +    - WIDEMUL=int128  ENDOMORPHISM=yes  ECDH=yes EXPERIMENTAL=yes SCHNORRSIG=yes
 +    - WIDEMUL=int128                    ASM=x86_64
 +    - WIDEMUL=int128  ENDOMORPHISM=yes  ASM=x86_64
      - BIGNUM=no
 -    - BIGNUM=no       ENDOMORPHISM=yes RECOVERY=yes EXPERIMENTAL=yes
 +    - BIGNUM=no       ENDOMORPHISM=yes RECOVERY=yes EXPERIMENTAL=yes SCHNORRSIG=yes
      - BIGNUM=no       STATICPRECOMPUTATION=no
-     - BUILD=distcheck CTIMETEST= BENCH=
+     - BUILD=distcheck CTIMETEST=no BENCH=no
      - CPPFLAGS=-DDETERMINISTIC
-     - CFLAGS=-O0 CTIMETEST=
+     - CFLAGS=-O0 CTIMETEST=no
      - ECMULTGENPRECISION=2
      - ECMULTGENPRECISION=8
      - VALGRIND=yes ENDOMORPHISM=yes BIGNUM=no ASM=x86_64 EXPERIMENTAL=yes ECDH=yes  RECOVERY=yes EXTRAFLAGS="--disable-openssl-tests" CPPFLAGS=-DVALGRIND BUILD=
diff --cc contrib/travis.sh
index 4859756,7af354e..891027b
--- a/contrib/travis.sh
+++ b/contrib/travis.sh
@@@ -56,12 -55,8 +56,12 @@@ the
      then
          $EXEC ./bench_ecdh >> bench.log 2>&1
      fi
 +    if [ "$SCHNORRSIG" = "yes" ]
 +    then
 +        $EXEC ./bench_schnorrsig >> bench.log 2>&1
 +    fi
  fi
- if [ -n "$CTIMETEST" ]
+ if [ "$CTIMETEST" = "yes" ]
  then
      ./libtool --mode=execute valgrind --error-exitcode=42 ./valgrind_ctime_test > valgrind_ctime_test.log 2>&1
  fi