Browse Source

Merge pull request #46431 from rumpl/fix-ci-timeout

Use process substitution to redirect to tee
Sebastiaan van Stijn 1 year ago
parent
commit
6dcefa3739
2 changed files with 2 additions and 2 deletions
  1. 1 1
      hack/make/test-docker-py
  2. 1 1
      hack/make/test-integration

+ 1 - 1
hack/make/test-docker-py

@@ -68,4 +68,4 @@ source hack/make/.integration-test-helpers
 		exec docker run --rm ${run_opts} --mount type=bind,"src=${ABS_DEST}","dst=/src/${DEST}" "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration
 		exec docker run --rm ${run_opts} --mount type=bind,"src=${ABS_DEST}","dst=/src/${DEST}" "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration
 	)
 	)
 	bundle .integration-daemon-stop
 	bundle .integration-daemon-stop
-) 2>&1 | tee -a "$DEST/test.log"
+) &> >(tee -a "$DEST/test.log")

+ 1 - 1
hack/make/test-integration

@@ -24,4 +24,4 @@ fi
 	set -x
 	set -x
 	exit ${testexit}
 	exit ${testexit}
 
 
-) 2>&1 | tee -a "$DEST/test.log"
+) &> >(tee -a "$DEST/test.log")