Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

This commit is contained in:
Nick Mathewson 2019-10-22 12:10:08 -04:00
commit 21c3488af7
2 changed files with 15 additions and 0 deletions

View File

@ -100,6 +100,18 @@ test_script:
on_finish:
- ps: >-
<# if we failed before install:, these functions won't be defined #>
Function Execute-Command ($commandPath)
{
& $commandPath $args 2>&1
if ( $LastExitCode -ne 0 ) {
$host.SetShouldExit( $LastExitCode )
}
}
Function Execute-Bash ()
{
Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
}
if ($env:compiler -eq "mingw") {
<# use the MSYS2 user binaries to archive failures #>
$oldpath = ${env:Path} -split ';'

3
changes/bug31884 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (Appveyor CI):
- Avoid spurious errors when Appveyor CI fails before the install step.
Fixes bug 31884; bugfix on 0.3.4.2-alpha.