diff options
author | Michelle McDaniel <adiaaida@gmail.com> | 2016-08-30 09:52:13 -0700 |
---|---|---|
committer | Michelle McDaniel <adiaaida@gmail.com> | 2016-09-01 12:31:59 -0700 |
commit | 4d51ced0cd78abb9439f31d6599600b33d7e8e0d (patch) | |
tree | 5fc854eea493367a18fd07b9190c2239aac98206 /netci.groovy | |
parent | 62f28d6d7801ce4c691194950798130502a4b13b (diff) | |
download | coreclr-4d51ced0cd78abb9439f31d6599600b33d7e8e0d.tar.gz coreclr-4d51ced0cd78abb9439f31d6599600b33d7e8e0d.tar.bz2 coreclr-4d51ced0cd78abb9439f31d6599600b33d7e8e0d.zip |
Fix format.py
In format.py, we were downloading bootstrap.sh/cmd to the current working
directory, but assuming that it was in coreclr/bootstrap, which is
incorrect. This change downloads it directly to coreclr/bootstrap, so that
we download and run to the same location.
This change also modifies where we install the newer version of dotnetcli
needed for jitutils to the coreclr/dotnetcli-jitutils directory. This
change is necessary because build.cmd->run.cmd->init-tools.cmd removes the
Tools directory, including our dotnetcli directory, so we don't want our
version of the cli to be trashed.
We also clean up our work at the end of the script by removing the
created jitutils and dotnetcli directories, and the bootstrap script.
Finally, this change adds some comments to tell the user what it's doing.
Diffstat (limited to 'netci.groovy')
-rwxr-xr-x | netci.groovy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy index 071048dffa..00e2d5b635 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1740,7 +1740,7 @@ combinedScenarios.each { scenario -> buildCommands += "set __TestIntermediateDir=int&&build-test.cmd ${lowerConfiguration} ${arch}" } else if (scenario == 'formatting') { - buildCommands += "python tests\\scripts\\format.py -c %WORKSPACE% -o Windows_NT -a ${arch}" + buildCommands += "python -u tests\\scripts\\format.py -c %WORKSPACE% -o Windows_NT -a ${arch}" break } else { |