aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ci/build.ps124
1 files changed, 15 insertions, 9 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1
index d530bbad52..0476d2a0b7 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -97,15 +97,21 @@ bin\nvim --version ; exitIfFailed
# Functional tests
# The $LastExitCode from MSBuild can't be trusted
-$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
+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
}