Index: chrome/build_nacl_irt.py |
=================================================================== |
--- chrome/build_nacl_irt.py (revision 97950) |
+++ chrome/build_nacl_irt.py (working copy) |
@@ -60,6 +60,20 @@ |
stdout=subprocess.PIPE, |
stderr=subprocess.PIPE) |
(p_stdout, p_stderr) = p.communicate() |
+ # If things fail on windows, try running --help, if that fails, |
noelallen_use_chromium
2011/08/24 00:21:38
How about returning a specific error code from sco
|
+ # emit this script as an input (to satiate gyp), and assume we're being |
+ # run on a test only bot. |
+ if p.returncode != 0 and sys.platform == 'win32': |
+ cmd = [sys.executable, 'scons.py', '--help'] |
+ p = subprocess.Popen(cmd, cwd=NACL_DIR, |
+ stdout=subprocess.PIPE, |
+ stderr=subprocess.PIPE) |
+ (p_stdout, p_stderr) = p.communicate() |
+ if p.returncode !=0: |
+ # If scons can't even run, emit just this script as an input. |
+ # See comment above this one. |
+ print RelativePath(__file__, SCRIPT_DIR) |
+ return |
if p.returncode != 0: |
sys.exit(2) |
# Extract unique inputs. |