Merge lp://staging/~sinzui/juju-release-tools/cross-compile-win into lp://staging/juju-release-tools
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Martin Packman | ||||
Approved revision: | 93 | ||||
Merged at revision: | 93 | ||||
Proposed branch: | lp://staging/~sinzui/juju-release-tools/cross-compile-win | ||||
Merge into: | lp://staging/juju-release-tools | ||||
Diff against target: |
108 lines (+45/-1) 2 files modified
tests/test_winbuildtest.py (+24/-0) winbuildtest.py (+21/-1) |
||||
To merge this branch: | bzr merge lp://staging/~sinzui/juju-release-tools/cross-compile-win | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Approve | ||
Review via email: mp+239763@code.staging.launchpad.net |
Description of the change
This branch introduces two improvements to winbuildtest.py.
1. We get the stderr from the commands run by check_output.
2. The script always sets up cross-compilation for win amd64 and 386.
These two change allowed me to verify go is always ready for cross-compilation when we run it over ssh, and it confirms that win-deps are broken. I see this output when I ran a copy of this script on the win-slave
Command '('\\go\
COMMAND OUTPUT:
..\..\.
C:\Go\
C:\Users\
..\..\.
C:\Go\
C:\Users\
..\..\.
C:\Go\
C:\Users\
I feel vindicated that I can repeatedly setup cross-compilation. I don't think these deps are new, so maybe I was testing with an old tarball when I added win-agent buulding. agent building remains disabled.
Looks good.
+ env['PATH'] = '{};{}' .format( env['PATH' ], gcc_bin_dir)
Can use os.pathsep rather than ';' but pretty irrelevant. Likewis don't think we need to worry about PATH being empty or unset really.