Revert "ci/win: don't use lastexitcode hack on mingw build"

This reverts commit bc43d2559f.

stderr redirection should make the workaround work for mingw builds.
This commit is contained in:
Jan Edmund Lazo 2018-04-13 13:38:31 -04:00
parent 8e87d89a99
commit ad30907814

View File

@ -97,21 +97,15 @@ bin\nvim --version ; exitIfFailed
# Functional tests # Functional tests
# The $LastExitCode from MSBuild can't be trusted # The $LastExitCode from MSBuild can't be trusted
if ($compiler -eq 'MSVC') { $failed = $false
$failed = $false # Temporarily turn off tracing to reduce log file output
# Temporarily turn off tracing to reduce log file output Set-PSDebug -Off
Set-PSDebug -Off cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs |
cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs | foreach { $failed = $failed -or
foreach { $failed = $failed -or $_ -match 'Running functional tests failed with error'; $_ }
$_ -match 'Running functional tests failed with error'; $_ } Set-PSDebug -Trace 1
Set-PSDebug -Trace 1 if ($failed) {
if ($failed) { exit $LastExitCode
exit $LastExitCode
}
}
else {
cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs
exitIfFailed
} }