From ef37761feed0172baa03dd94c842f1547bdf3016 Mon Sep 17 00:00:00 2001
From: Elichai Turkel <elichai.turkel@gmail.com>
Date: Thu, 30 Jul 2020 11:18:07 +0300
Subject: [PATCH 1/2] 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

---
 contrib/travis.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/travis.sh b/contrib/travis.sh
index 2c0cbcd6ba47e..7af354e68a632 100755
--- a/contrib/travis.sh
+++ b/contrib/travis.sh
@@ -23,16 +23,16 @@ 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,7 +56,7 @@ then
         $EXEC ./bench_ecdh >> 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

From 34debf7a6d36bbd9a52e68e079ddfc446faf5bef Mon Sep 17 00:00:00 2001
From: Elichai Turkel <elichai.turkel@gmail.com>
Date: Mon, 14 Sep 2020 18:02:25 +0300
Subject: [PATCH 2/2] Modify .travis.yml to explictly pass no in env vars
 instead of setting to nothing

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6ad6fb27eaa4..c247a11e3f066 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,9 +31,9 @@ env:
     - BIGNUM=no
     - BIGNUM=no       ENDOMORPHISM=yes RECOVERY=yes EXPERIMENTAL=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=