[sanitizer] More robust rm calls
Sometimes rm fails the first time.
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
index 74fc5b3..b4b9a89 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
@@ -40,11 +40,11 @@
if ccache -s ; then
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLLVM_CCACHE_BUILD=ON"
- rm -rf llvm_build64
+ rm_dirs llvm_build64
fi
echo @@@BUILD_STEP bootstrap clang@@@
- rm -rf ${STAGE2_CLOBBER}
+ rm_dirs ${STAGE2_CLOBBER}
mkdir -p llvm_build64
if [[ "$(cat llvm_build64/CMAKE_OPTIONS)" != "${CMAKE_OPTIONS}" ]] ; then
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
index ab52e3f..5c493c7 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
@@ -20,14 +20,18 @@
)
echo @@@BUILD_STEP Prepare@@@
+function rm_dirs {
+ while ! rm -rf $@ ; do sleep 1; done
+}
+
function stage1_clobber {
- rm -rf llvm_build2_* llvm_build_* libcxx_build_* ${STAGE1_CLOBBER:-}
+ rm_dirs llvm_build2_* llvm_build_* libcxx_build_* ${STAGE1_CLOBBER:-}
}
function clobber {
if [ "$BUILDBOT_CLOBBER" != "" ]; then
echo @@@BUILD_STEP clobber@@@
- rm -rf svn_checkout llvm llvm-project llvm_build0 ${CLOBBER:-}
+ rm_dirs svn_checkout llvm llvm-project llvm_build0 ${CLOBBER:-}
stage1_clobber
! test "$(ls -A .)" || echo @@@STEP_EXCEPTION@@@
fi
