jenkins-bot has submitted this change and it was merged.
Change subject: Fix globs in global and mw-selenium teardown scripts
......................................................................
Fix globs in global and mw-selenium teardown scripts
The * glob pattern was incorrectly quoted, resulting in no TMPDIR files
from actually being deleted during teardown.
Fixes regression in I7803395f7f1774d501b60df42e2d7b6628352738
Bug: T120824
Change-Id: I4edf7099acfeb0f06ea2042902bef03097137d6e
---
M bin/global-teardown.sh
M bin/mw-selenium-teardown.sh
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/global-teardown.sh b/bin/global-teardown.sh
index 6399f4d..329cc9d 100755
--- a/bin/global-teardown.sh
+++ b/bin/global-teardown.sh
@@ -13,5 +13,5 @@
# Have bash '*' to expand dot files as well
shopt -s dotglob
-rm -v -rf "${TMPDIR_FS}/*"
-rm -v -rf "${TMPDIR_REGULAR}/*"
+rm -v -rf "$TMPDIR_FS"/*
+rm -v -rf "$TMPDIR_REGULAR"/*
diff --git a/bin/mw-selenium-teardown.sh b/bin/mw-selenium-teardown.sh
index 4c48c68..3cde013 100755
--- a/bin/mw-selenium-teardown.sh
+++ b/bin/mw-selenium-teardown.sh
@@ -5,4 +5,4 @@
# Have bash '*' to expand dot files as well.
# We keep the directory see bin/global-teardown.sh and T120824
shopt -s dotglob
-rm -v -rf "$TMPDIR/*"
+rm -v -rf "$TMPDIR"/*
--
To view, visit https://gerrit.wikimedia.org/r/260407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4edf7099acfeb0f06ea2042902bef03097137d6e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
