diff options
| -rw-r--r-- | ci/build.ps1 | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1 index 0476d2a0b7..d530bbad52 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -97,21 +97,15 @@ bin\nvim --version ; exitIfFailed # Functional tests # The $LastExitCode from MSBuild can't be trusted -if ($compiler -eq 'MSVC') { - $failed = $false - # Temporarily turn off tracing to reduce log file output - Set-PSDebug -Off - cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs | - foreach { $failed = $failed -or - $_ -match 'Running functional tests failed with error'; $_ } - Set-PSDebug -Trace 1 - if ($failed) { - exit $LastExitCode - } -} -else { - cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs - exitIfFailed +$failed = $false +# Temporarily turn off tracing to reduce log file output +Set-PSDebug -Off +cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs | + foreach { $failed = $failed -or + $_ -match 'Running functional tests failed with error'; $_ } +Set-PSDebug -Trace 1 +if ($failed) { + exit $LastExitCode } |