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

Unified Diff: build/scripts/slave/runtest.py

Issue 26672003: Remove references to sconsbuild. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/
Patch Set: Created 7 years, 2 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 | « build/scripts/slave/compile.py ('k') | build/scripts/tools/slaves.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/scripts/slave/runtest.py
===================================================================
--- build/scripts/slave/runtest.py (revision 227745)
+++ build/scripts/slave/runtest.py (working copy)
@@ -810,12 +810,10 @@
if len(args) < 1:
raise chromium_utils.MissingArgument('Usage: %s' % USAGE)
- sconsbuild_exists = os.path.exists(
- os.path.join(os.path.dirname(options.build_dir), 'sconsbuild'))
out_exists = os.path.exists(
os.path.join(os.path.dirname(options.build_dir), 'out'))
build_dir, _ = build_directory.ConvertBuildDirToLegacy(
- options.build_dir, use_out=(out_exists and not sconsbuild_exists))
+ options.build_dir, use_out=out_exists)
build_dir = os.path.normpath(os.path.abspath(build_dir))
if options.slave_name:
slave_name = options.slave_name
« no previous file with comments | « build/scripts/slave/compile.py ('k') | build/scripts/tools/slaves.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698