diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-06-24 12:08:08 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-06-24 12:30:32 +0000 |
| commit | 922f60762775fab4f4b91f554ed913a48b91a6ab (patch) | |
| tree | 8138c0c860251366d33506b2c53341ec298d9f9d /src/test | |
| parent | a377af083e2d3edb77a9c071c09cb40b318a8dd1 (diff) | |
Cleanup the WORKSPACE_DIR in the test-setup
When executing several tests it might happens that the WORKSPACE_DIR
was already defined, leading to "File exists" errors.
--
Change-Id: I96cf0b67bfb78a3dee4bb712b74827ac179327be
Reviewed-on: https://bazel-review.googlesource.com/#/c/1561/
MOS_MIGRATED_REVID=96765096
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/shell/bazel/test-setup.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh index f95f33c36c..1ea5b151a8 100755 --- a/src/test/shell/bazel/test-setup.sh +++ b/src/test/shell/bazel/test-setup.sh @@ -106,6 +106,7 @@ workspaces=() function create_new_workspace() { set -e new_workspace_dir=${1:-$(mktemp -d ${TEST_TMPDIR}/workspace.XXXXXXXX)} + rm -fr ${new_workspace_dir} mkdir -p ${new_workspace_dir} workspaces+=(${new_workspace_dir}) cd ${new_workspace_dir} @@ -128,6 +129,7 @@ function create_new_workspace() { function setup_clean_workspace() { export WORKSPACE_DIR=${TEST_TMPDIR}/workspace echo "setting up client in ${WORKSPACE_DIR}" + rm -fr ${WORKSPACE_DIR} create_new_workspace ${WORKSPACE_DIR} [ "${new_workspace_dir}" = "${WORKSPACE_DIR}" ] || \ { echo "Failed to create workspace" >&2; exit 1; } |