Added sconsbuild/ to nacl_integration search path.

buildbot_chrome_nacl_stage.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """Do all the steps required to build and test against nacl."""
 
 
 import optparse
 import os.path
@@ skipping 40 matching lines @@
 
   # List of places that chrome could live.
   # In theory we should be more careful about what platform we're actually
   # building for.
   # As currently constructed, this will also hork people who have debug and
   # release builds sitting side by side who build locally.
   mode = options.mode
   chrome_locations = [
       'build/%s/chrome.exe' % mode,
       'chrome/%s/chrome.exe' % mode,
+      'sconsbuild/%s/chrome.exe' % mode,

[Mark Seaborn, 2013/01/09 00:23:11]

Can you put the explanation from the commit message as a comment here, please? 
And also mention that it is scripts/slave/extract_build.py that unpacks the zip
file as "sconsbuild"?

Then LGTM.

[Mark Seaborn, 2013/01/09 00:28:22]

Hang on, this doesn't look right.

"sconsbuild" is only used on Linux by extract_build.py.  So "chrome.exe" won't
help.

Also, this looks for sconsbuild/{Debug,Release}/chrome.exe, right?

But this log *seems* to show the file being extracted to
sconsbuild/full-build-linux/chrome:


http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29...

Try 1: Fetching build from
http://build13-m1/b/build/slave/Linux_Builder__dbg_/chrome_staging/full-build....
.....
Download complete
.Extracting build full-build-linux.zip to
/mnt/data/b/build/slave/Linux_Tests__dbg__2_/build/src/sconsbuild...

unzip -o /mnt/data/b/build/slave/Linux_Tests__dbg__2_/build/full-build-linux.zip
Archive: 
/mnt/data/b/build/slave/Linux_Tests__dbg__2_/build/full-build-linux.zip
   creating: full-build-linux/
  inflating: full-build-linux/chrome.pak  
  inflating: full-build-linux/ppapi_nacl_tests_newlib_x64.nexe  
  inflating: full-build-linux/chrome_sandbox  
...


Can you check on the buildbot where the file is actually extracted to?

[Mark Seaborn, 2013/01/09 01:01:07]

I meant can you add a comment into the Python source, please?

       # Windows Chromium ninja builder
       'out/%s/chrome.exe' % mode,
       'out/%s/chrome' % mode,
       # Mac Chromium make builder
       'out/%s/Chromium.app/Contents/MacOS/Chromium' % mode,
       # Mac release make builder
       'out/%s/Google Chrome.app/Contents/MacOS/Google Chrome' % mode,
       # Mac Chromium xcode builder
       'xcodebuild/%s/Chromium.app/Contents/MacOS/Chromium' % mode,
       # Mac release xcode builder
@@ skipping 261 matching lines @@
     else:
       options.enable_pnacl = 0
 
   if args:
     parser.error('ERROR: invalid argument')
   BuildAndTest(options)
 
 
 if __name__ == '__main__':
   Main()