From 8b5cd847d0baa4b43836eea9ec0a6d7945b9b8d4 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 13 Jun 2018 13:27:43 -0700 Subject: [PATCH] tests/semaphore.test.bash: use "sudo" for docker, clean up Signed-off-by: Gyuho Lee --- tests/semaphore.test.bash | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash index ac6a54da3..2c427fac9 100755 --- a/tests/semaphore.test.bash +++ b/tests/semaphore.test.bash @@ -19,8 +19,6 @@ TEST_OPTS="PASSES='build grpcproxy'" bash tests/semaphore.test.bash TEST_OPTS="coverage" bash tests/semaphore.test.bash COMMENT -TEST_SUFFIX=$(date +%s | base64 | head -c 15) - if [ -z "${TEST_OPTS}" ]; then TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7" fi @@ -30,13 +28,7 @@ fi echo "Running tests with" ${TEST_OPTS} if [ "${TEST_OPTS}" == "coverage" ]; then - make docker-test-coverage + sudo HOST_TMP_DIR=/tmp make docker-test-coverage else - docker run \ - --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd \ - gcr.io/etcd-development/etcd-test:go1.10.3 \ - /bin/bash -c "${TEST_OPTS} ./test 2>&1 | tee test-${TEST_SUFFIX}.log" - - ! egrep "(--- FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 test-${TEST_SUFFIX}.log + sudo HOST_TMP_DIR=/tmp TEST_OPTS="${TEST_OPTS}" make docker-test fi