Revert "Linux: Remove some references to the sconsbuild directory."

scripts/slave/slave_utils.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.
 
 """Functions specific to build slaves, shared by several buildbot scripts.
 """
 
 import commands
 import os
@@ skipping 233 matching lines @@
                                             'setup_mount.bat')
 
     chromium_utils.RunCommand([setup_mount])
   else:
     os.environ['PYTHONPATH'] = (chromium_utils.FindUpward(build_dir,
         'tools', 'python') + ":" + os.environ.get('PYTHONPATH', ''))
     python_exe = 'python'
 
   if sys.platform == 'linux2':
     slave_name = SlaveBuildName(build_dir)
-    StartVirtualX(slave_name, os.path.join(build_dir, '..', 'out', target))
-
+    StartVirtualX(slave_name,
+                  os.path.join(build_dir, '..', 'sconsbuild', target))
 
   if sys.platform == 'darwin':
     # CrashReporter/ReportCrash take forever to walk through all of the
     # debugging symbols.  Since we expect crashes, strip the debugging
     # symbols so that ReportCrash doesn't have so much to chew on.
     # TODO(mmentovai): instead of stripping symbols, come up with a better
     # way to suppress ReportCrash from within the TestShell process.
     test_shell_executable = chromium_utils.FindUpward(build_dir,
                                                       'xcodebuild',
                                                       target,
@@ skipping 129 matching lines @@
   # Run the gsutil command. gsutil internally calls command_wrapper, which
   # will try to run the command 10 times if it fails.
   global command_output
   command_output = ''
   def GatherOutput(line):
     global command_output
     command_output += line + '\n'
   command = [gsutil, 'ls', '-l', gs_base]
   status = chromium_utils.RunCommand(command, parser_func=GatherOutput)
   return (status, command_output)