diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-04-15 02:37:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-15 02:37:22 +0200 |
| commit | a7e7f7bd83abc5c31008e40556f794d9b00db431 (patch) | |
| tree | 1e0fdc80c9dd08aff01735a30aed9c2d79792f7d /ci | |
| parent | ee4e1fd8ecf1747b55d2968084047552429cedee (diff) | |
| parent | 51b9d85bb47495014968922d4adff5319ba44900 (diff) | |
| download | rneovim-a7e7f7bd83abc5c31008e40556f794d9b00db431.tar.gz rneovim-a7e7f7bd83abc5c31008e40556f794d9b00db431.tar.bz2 rneovim-a7e7f7bd83abc5c31008e40556f794d9b00db431.zip | |
Merge #8160 'win: oldtests: prefer cmd.exe'
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/build.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1 index 71cc7c5b50..8eb237ccd1 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -100,7 +100,7 @@ bin\nvim --version ; exitIfFailed $failed = $false # Temporarily turn off tracing to reduce log file output Set-PSDebug -Off -cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs | +cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 | foreach { $failed = $failed -or $_ -match 'Running functional tests failed with error'; $_ } Set-PSDebug -Trace 1 @@ -114,7 +114,7 @@ if ($uploadToCodecov) { } # Old tests -$env:PATH += ';C:\msys64\usr\bin' +$env:PATH = "C:\msys64\usr\bin;$env:PATH" & "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 if ($uploadToCodecov) { |