Added sconsbuild/ to nacl_integration search path.

Added sconsbuild/ to nacl_integration search path.

out/Debug is the current preferred place to put binaries, but keeping
sconsbuild/Debug in the search path because that's where the build
system currently puts it.

More specifically, scripts/slave/extract_build.py extracts builds to src/sconsbuild/Debug rather than src/out/Debug
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175843

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

https://codereview.chromium.org/11824011/diff/1/buildbot_chrome_nacl_stage.py
File buildbot_chrome_nacl_stage.py (right):

https://codereview.chromium.org/11824011/diff/1/buildbot_chrome_nacl_stage.py...
buildbot_chrome_nacl_stage.py:61: 'sconsbuild/%s/chrome.exe' % mode,
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]

https://codereview.chromium.org/11824011/diff/1/buildbot_chrome_nacl_stage.py
File buildbot_chrome_nacl_stage.py (right):

https://codereview.chromium.org/11824011/diff/1/buildbot_chrome_nacl_stage.py...
buildbot_chrome_nacl_stage.py:61: 'sconsbuild/%s/chrome.exe' % mode,
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?

[Ryan Tseng, 2013-01-09 00:34:46]

Oops my bad, fixed

Also it extracts it to sconsbuild/full-linux-build/Debug, then copies the folder
down one level after it completes
===
Moving build from
/mnt/data/b/build/slave/Linux_Tests__dbg__2_/build/src/sconsbuild/full-build-linux
to /mnt/data/b/build/slave/Linux_Tests__dbg__2_/build/src/sconsbuild/Debug
===

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

https://codereview.chromium.org/11824011/diff/1/buildbot_chrome_nacl_stage.py
File buildbot_chrome_nacl_stage.py (right):

https://codereview.chromium.org/11824011/diff/1/buildbot_chrome_nacl_stage.py...
buildbot_chrome_nacl_stage.py:61: 'sconsbuild/%s/chrome.exe' % mode,
On 2013/01/09 00:23:11, Mark Seaborn wrote:
> 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.

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

[Ryan Tseng, 2013-01-09 01:04:32]

Ohhh. got it. Done.

[Mark Seaborn, 2013-01-09 01:07:58]

LGTM, thanks

[commit-bot: I haz the power, 2013-01-09 01:15:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hinoka@google.com/11824011/7001

[commit-bot: I haz the power, 2013-01-09 01:26:45]

Retried try job too often on ios_rel_device for step(s) compile

[commit-bot: I haz the power, 2013-01-09 02:40:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hinoka@google.com/11824011/4009

[commit-bot: I haz the power, 2013-01-09 02:40:20]

Failed to apply patch for
chrome/test/nacl_test_injection/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         chrome/test/nacl_test_injection/chrome
  Created missing directory chrome/test/nacl_test_injection/chrome.
  A         chrome/test/nacl_test_injection/chrome/test
  Created missing directory chrome/test/nacl_test_injection/chrome/test.
  A         chrome/test/nacl_test_injection/chrome/test/nacl_test_injection
  Created missing directory
chrome/test/nacl_test_injection/chrome/test/nacl_test_injection.
  patching file
chrome/test/nacl_test_injection/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
  Hunk #1 FAILED at 58.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/test/nacl_test_injection/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py.rej

Patch:      
chrome/test/nacl_test_injection/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
Index: chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
diff --git
chrome/test/nacl_test_injection/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
chrome/test/nacl_test_injection/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
index
b81ac6117c45966adb65af58be18c7dc1ef8f9b6..b21e2bc30236cc7c89b72260e3fac181f4ed539c
100755
---
a/chrome/test/nacl_test_injection/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
+++
b/chrome/test/nacl_test_injection/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
@@ -58,6 +58,9 @@ def FindChrome(src_dir, options):
   chrome_locations = [
       'build/%s/chrome.exe' % mode,
       'chrome/%s/chrome.exe' % mode,
+      # For Linux buildbots.  scripts/slave/extract_build.py extracts builds
+      # to src/sconsbuild/ rather than src/out/.
+      'sconsbuild/%s/chrome' % mode,
       # Windows Chromium ninja builder
       'out/%s/chrome.exe' % mode,
       'out/%s/chrome' % mode,