aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <janedmundlazo@hotmail.com>2018-04-11 14:03:21 -0400
committerJan Edmund Lazo <janedmundlazo@hotmail.com>2018-04-12 02:39:25 -0400
commitbc43d2559f33aa6334d70834b389f0bc59dadcbf (patch)
tree59025305d46ba56d4b742bd7ccce86373cd78b67
parent7c8122f36d219ab5aaea1b772e301cf1cff80cce (diff)
downloadrneovim-bc43d2559f33aa6334d70834b389f0bc59dadcbf.tar.gz
rneovim-bc43d2559f33aa6334d70834b389f0bc59dadcbf.tar.bz2
rneovim-bc43d2559f33aa6334d70834b389f0bc59dadcbf.zip
ci/win: don't use lastexitcode hack on mingw build
The heck is for MSVC builds to workaround msbuild error detection for cmake.
-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
}