Fix GOTESTCOMMAND for e2e tests.

Author: winder

scripts/travis/run_tests.sh

@@ -13,7 +13,7 @@ if [ "${BUILD_TYPE}" = "integration" ]; then
         SHORTTEST=-short
     fi
     export SHORTTEST 
-    ./test/scripts/run_integration_tests.sh
+    make integration
 elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ] || [[ "${TRAVIS_BRANCH}" =~ ^rel/ ]]; then
     if [[ "${OS}" != "darwin" ]]; then
 	    make fulltest -j2

scripts/travis/test.sh

@@ -15,7 +15,6 @@ chmod +x ~/gimme
 eval "$(~/gimme "${GOLANG_VERSION}")"
 
 "${SCRIPTPATH}/../buildtools/install_buildtools.sh" "gotest.tools/gotestsum"
-export GOTESTCOMMAND="gotestsum --format pkgname --jsonfile testresults.json --"
 
 if [ "${OS}-${ARCH}" = "linux-arm" ] || [ "${OS}-${ARCH}" = "windows-amd64" ]; then
      # for arm, no tests need to be invoked.

test/scripts/e2e_go_tests.sh

@@ -92,10 +92,10 @@ fi
 echo "PARALLEL_FLAG = ${PARALLEL_FLAG}"
 
 if [ "${#TESTPATTERNS[@]}" -eq 0 ]; then
-    ${GOTESTCOMMAND} --format pkgname --jsonfile integrationtestresults.json -- ${RACE_OPTION} ${PARALLEL_FLAG} -timeout 1h -v ${SHORTTEST} ./...
+    ${GOTESTCOMMAND} ${RACE_OPTION} ${PARALLEL_FLAG} -timeout 1h -v ${SHORTTEST} ./...
 else
     for TEST in ${TESTPATTERNS[@]}; do
-        ${GOTESTCOMMAND} --format pkgname --jsonfile integrationtestresults.json -- ${RACE_OPTION} ${PARALLEL_FLAG} -timeout 1h -v ${SHORTTEST} -run ${TEST} ./...
+        ${GOTESTCOMMAND} ${RACE_OPTION} ${PARALLEL_FLAG} -timeout 1h -v ${SHORTTEST} -run ${TEST} ./...
     done
 fi