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

diff --combined .travis.yml
index e1a88c40510a22ae86f3c8a46b80cc02ac912575,c247a11e3f0666e9e129fe6a59ca49d3312753c9..14f3cafe3cb084e74723f0c433c00f18e4d20d3c
--- 1/.travis.yml
--- 2/.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=
@@@ -83,10 -83,6 +83,10 @@@ matrix
              - valgrind
              - libtool-bin
              - libc6-dbg:i386
 +    # S390x build (big endian system)
 +    - compiler: gcc
 +      env: HOST=s390x-unknown-linux-gnu ECDH=yes RECOVERY=yes EXPERIMENTAL=yes CTIMETEST=
 +      arch: s390x
  
  # We use this to install macOS dependencies instead of the built in `homebrew` plugin,
  # because in xcode earlier than 11 they have a bug requiring updating the system which overall takes ~8 minutes.

diff --combined contrib/travis.sh
index 4859756e891923d5054d9aa210be0075aa3e5676,7af354e68a63265869e49e91ff8c8f25e09bf72b..891027b709f7a1b8fae378a73f18353d93ef15ca
--- 1/contrib/travis.sh
--- 2/contrib/travis.sh
+++ b/contrib/travis.sh
@@@ -14,26 -14,25 +14,26 @@@ f
  
  ./configure \
      --enable-experimental="$EXPERIMENTAL" --enable-endomorphism="$ENDOMORPHISM" \
 -    --with-field="$FIELD" --with-bignum="$BIGNUM" --with-asm="$ASM" --with-scalar="$SCALAR" \
 +    --with-test-override-wide-multiply="$WIDEMUL" --with-bignum="$BIGNUM" --with-asm="$ASM" \
      --enable-ecmult-static-precomputation="$STATICPRECOMPUTATION" --with-ecmult-gen-precision="$ECMULTGENPRECISION" \
      --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
 +    --enable-module-schnorrsig="$SCHNORRSIG" \
      --host="$HOST" $EXTRAFLAGS
  
  if [ -n "$BUILD" ]
  then
      make -j2 "$BUILD"
  fi
- if [ -n "$VALGRIND" ]
+ if [ "$VALGRIND" = "yes" ]
  then
      make -j2
      # the `--error-exitcode` is required to make the test fail if valgrind found errors, otherwise it'll return 0 (http://valgrind.org/docs/manual/manual-core.html)
      valgrind --error-exitcode=42 ./tests 16
      valgrind --error-exitcode=42 ./exhaustive_tests
  fi
- if [ -n "$BENCH" ]
+ if [ "$BENCH" = "yes" ]
  then
-     if [ -n "$VALGRIND" ]
+     if [ "$VALGRIND" = "yes" ]
      then
          # Using the local `libtool` because on macOS the system's libtool has nothing to do with GNU libtool
          EXEC='./libtool --mode=execute valgrind --error-exitcode=42'
@@@ -56,12 -55,8 +56,12 @@@
      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