Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5076)

Unified Diff: build/landmines.py

Issue 955953002: Clobber output directory on linux and mac after landmine. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/landmines.py
diff --git a/build/landmines.py b/build/landmines.py
index c41f123051a3829f65670c1d1be35f5df5dfafdc..d855315ee9e52826b62dd17ed9dd2b2a52a1516c 100755
--- a/build/landmines.py
+++ b/build/landmines.py
@@ -165,11 +165,18 @@ def clobber_if_necessary(new_landmines):
# checkouts have the build directory mounted.
for f in os.listdir(out_dir):
path = os.path.join(out_dir, f)
- # Soft version of chromium's clobber. Only delete directories not files
- # as e.g. on windows the output dir is the build dir that shares some
- # checked out files.
- if os.path.isdir(path) and re.search(r"(?:[Rr]elease)|(?:[Dd]ebug)", f):
- delete_build_dir(path)
+ if os.path.basename(out_dir) == 'build':
+ # Soft version of chromium's clobber. Only delete build directories not
+ # files in windows' build dir as the folder shares some checked out
+ # files and directories.
+ if (os.path.isdir(path) and
+ re.search(r'(?:[Rr]elease)|(?:[Dd]ebug)', f)):
+ delete_build_dir(path)
+ else:
+ if os.path.isfile(path):
+ os.unlink(path)
+ elif os.path.isdir(path):
+ delete_build_dir(path)
# Save current set of landmines for next time.
with open(landmines_path, 'w') as f:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698