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

Unified Diff: scripts/slave/chromium/layout_test_wrapper.py

Issue 6834004: Modify the way we pass the --results-directory to run_webkit_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 9 years, 8 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: scripts/slave/chromium/layout_test_wrapper.py
===================================================================
--- scripts/slave/chromium/layout_test_wrapper.py (revision 81317)
+++ scripts/slave/chromium/layout_test_wrapper.py (working copy)
@@ -48,12 +48,20 @@
]
if options.results_directory:
- # run_webkit_tests expects the results directory to be either an absolute
- # path (starting with '/') or relative to Debug or Release. We expect it
- # to be relative to the build_dir, which is a parent of Debug or Release.
- # Thus if it's a relative path, we need to move it out one level.
- if not options.results_directory.startswith('/'):
- options.results_directory = os.path.join('..', options.results_directory)
+ # Prior to the fix in https://bugs.webkit.org/show_bug.cgi?id=58272,
+ # run_webkit_tests expects the results directory to be relative to
+ # the configuration directory (e.g., src/webkit/Release). The
+ # parameter is given to us relative to build_dir, which is where we
+ # will run the command from.
+ #
+ # When 58272 is landed, run_webkit_tests will support absolute file
+ # paths as well as paths relative to CWD for non-Chromium ports and
+ # paths relative to the configuration dir for Chromium ports. As
+ # a transitional fix, we convert to an absolute dir, but once the
+ # hack in 58272 is removed, we can use results_dir as-is.
+ if not os.path.isabs(options.results_directory):
+ options.results_directory = os.path.abspath(
+ os.path.join(os.getcwd(), options.results_directory))
chromium_utils.RemoveDirectory(options.results_directory)
command.extend(['--results-directory', options.results_directory])
« 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