aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <janedmundlazo@hotmail.com>2018-04-13 13:38:31 -0400
committerJan Edmund Lazo <janedmundlazo@hotmail.com>2018-04-13 13:38:31 -0400
commitad30907814dafdfe8533fe49c62ee8eb3472e438 (patch)
treebb7784161eaf2cd2fcc700831c2f06115d7b1124
parent8e87d89a99b88d013655911ca9ebc34da37fbaa2 (diff)
downloadrneovim-ad30907814dafdfe8533fe49c62ee8eb3472e438.tar.gz
rneovim-ad30907814dafdfe8533fe49c62ee8eb3472e438.tar.bz2
rneovim-ad30907814dafdfe8533fe49c62ee8eb3472e438.zip
Revert "ci/win: don't use lastexitcode hack on mingw build"
This reverts commit bc43d2559f33aa6334d70834b389f0bc59dadcbf. stderr redirection should make the workaround work for mingw builds.
-rw-r--r--ci/build.ps124
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
}