From 0e5d81704f69d7c46d0ce3b384ef4c8c17d9cde9 Mon Sep 17 00:00:00 2001
From: Piotr Tabor <ptab@google.com>
Date: Thu, 1 Oct 2020 14:34:58 +0200
Subject: [PATCH] .travis.yml, scripts: Fix minor bugs in the test script.

1. setting environment variable cannot be in quote
2. "--race" testing for unit tests is supposed to be part of linux-amd64-unit-4-cpu-race config.
3. 'run' function in test script should log_error in case of failed
command (wrong operator for ints comparison in bash).
---
 .travis.yml         | 2 +-
 scripts/test_lib.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a47c98451..830d89bac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -125,7 +125,7 @@ script:
         sudo HOST_TMP_DIR=/tmp TEST_OPTS="VERBOSE='1'" make docker-test-coverage
         ;;
       linux-amd64-fmt-unit-go-tip-2-cpu)
-        GOARCH=amd64 PASSES='fmt unit' 'CPU=2' ./test -p=2
+        GOARCH=amd64 PASSES='fmt unit' CPU='2' RACE='false' ./test -p=2
         ;;
       linux-386-unit-1-cpu)
         docker run --rm \
diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh
index 6207c9c8e..51279c4ca 100644
--- a/scripts/test_lib.sh
+++ b/scripts/test_lib.sh
@@ -72,7 +72,7 @@ function run {
   log_callout "% ${repro}"
   "${@}"
   local error_code=$?
-  if [ ${error_code} != 0 ]; then
+  if [ ${error_code} -ne 0 ]; then
     log_error -e "FAIL: (code:${error_code}):\n  % ${repro}"
     return ${error_code}
   fi