Modify the way we pass the --results-directory to run_webkit_tests

scripts/slave/chromium/layout_test_wrapper.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A wrapper script to run layout tests on the buildbots.
 
 Runs the run_webkit_tests.py script found in webkit/tools/layout_tests above
 this script. For a complete list of command-line options, pass '--help' on the
 command line.
@@ skipping 30 matching lines @@
   slave_name = slave_utils.SlaveBuildName(build_dir)
 
   command = [run_webkit_tests,
              '--noshow-results',
              '--verbose',  # Verbose output is enabled to support the dashboard.
              '--full-results-html',  # To make debugging failures easier.
              '--clobber-old-results',  # Clobber test results before each run.
             ]
 
   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])
 
   if options.target:
     command.extend(['--target', options.target])
   if options.platform:
     command.extend(['--platform', options.platform])
 
   # Build type is no longer used.
   # TODO(pamg): remove it from the buildbot config too.
@@ skipping 82 matching lines @@
                                  "this appengine server."))
   options, args = option_parser.parse_args()
 
   # Disable pageheap checking except on Windows.
   if sys.platform != 'win32':
     options.enable_pageheap = False
   return layout_test(options, args)
 
 if '__main__' == __name__:
   sys.exit(main())