From 724c10b113c5deb3464ce3bf9e7d0386c76ad3ac Mon Sep 17 00:00:00 2001
From: John Cater <jcater@google.com>
Date: Tue, 10 Nov 2020 11:14:55 -0500
Subject: [PATCH] Ignore errors when removing workspace dir in tests.

Fixes #12397.
---
 src/test/shell/testenv.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 8ab16b497f1543..1d5775e5b39356 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -595,7 +595,7 @@ workspaces=()
 # Set-up a new, clean workspace with only the tools installed.
 function create_new_workspace() {
   new_workspace_dir=${1:-$(mktemp -d ${TEST_TMPDIR}/workspace.XXXXXXXX)}
-  try_with_timeout rm -fr ${new_workspace_dir}
+  try_with_timeout rm -fr ${new_workspace_dir} > /dev/null 2>&1
   mkdir -p ${new_workspace_dir}
   workspaces+=(${new_workspace_dir})
   cd ${new_workspace_dir}