diff --git a/hack/make/test-integration b/hack/make/test-integration index 4c2bccaead..baad1349a2 100644 --- a/hack/make/test-integration +++ b/hack/make/test-integration @@ -10,6 +10,6 @@ bundle_test_integration() { # this "grep" hides some really irritating warnings that "go test -coverpkg" # spews when it is given packages that aren't used +exec > >(tee -a $DEST/test.log) 2>&1 bundle_test_integration 2>&1 \ - | grep --line-buffered -v '^warning: no packages being tested depend on ' \ - | tee $DEST/test.log + | grep --line-buffered -v '^warning: no packages being tested depend on ' diff --git a/hack/make/test-integration-cli b/hack/make/test-integration-cli index f2128a26ac..837bd8737a 100644 --- a/hack/make/test-integration-cli +++ b/hack/make/test-integration-cli @@ -11,6 +11,7 @@ bundle_test_integration_cli() { } # subshell so that we can export PATH without breaking other things +exec > >(tee -a $DEST/test.log) 2>&1 ( export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH" @@ -40,4 +41,4 @@ bundle_test_integration_cli() { DOCKERD_PID=$(set -x; cat $DEST/docker.pid) ( set -x; kill $DOCKERD_PID ) wait $DOCKERD_PID || true -) 2>&1 | tee $DEST/test.log +) diff --git a/hack/make/test-unit b/hack/make/test-unit index 066865859c..552810f349 100644 --- a/hack/make/test-unit +++ b/hack/make/test-unit @@ -49,7 +49,8 @@ bundle_test_unit() { echo true fi - } 2>&1 | tee $DEST/test.log + } } +exec > >(tee -a $DEST/test.log) 2>&1 bundle_test_unit