From a98d723977c56516dbdc9f8747f17ea8ea4803d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChnel?= Date: Fri, 13 Dec 2019 16:23:10 +0000 Subject: [PATCH] another shot at wrapping stdout --- scripts/git_checkout.ps1 | 10 +++++----- scripts/run_cmake.ps1 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/git_checkout.ps1 b/scripts/git_checkout.ps1 index 086889e..a7b7653 100644 --- a/scripts/git_checkout.ps1 +++ b/scripts/git_checkout.ps1 @@ -16,12 +16,12 @@ Set-PSDebug -Trace 1 if (Test-Path -PathType Container .git){ Write-Output "performing git pull..." - git checkout master 2>&1 - git reset --hard 2>&1 - git clean -fdx 2>&1 - git pull 2>&1 + git checkout master 2>&1 | %{ "$_" } + git reset --hard 2>&1 | %{ "$_" } + git clean -fdx 2>&1 | %{ "$_" } + git pull 2>&1 | %{ "$_" } # TODO: in case of errors: delete folder and clone } else { Write-Output "performing git clone..." - git clone -q --depth 1 https://github.com/llvm/llvm-project 2>&1 + git clone -q --depth 1 https://github.com/llvm/llvm-project 2>&1 | %{ "$_" } } \ No newline at end of file diff --git a/scripts/run_cmake.ps1 b/scripts/run_cmake.ps1 index c7287ad..2d9c3c8 100644 --- a/scripts/run_cmake.ps1 +++ b/scripts/run_cmake.ps1 @@ -21,7 +21,7 @@ Push-Location build Invoke-CmdScript "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 # Invoke-Call -ScriptBlock { -cmake ..\llvm -G Ninja -DCMAKE_BUILD_TYPE=Release -D LLVM_ENABLE_PROJECTS="clang;clang-tools-extra" -D LLVM_ENABLE_ASSERTIONS=ON -DLLVM_LIT_ARGS="-v --xunit-xml-output test-results.xml" -D LLVM_ENABLE_DIA_SDK=OFF --trace 2>&1 +cmake ..\llvm -G Ninja -DCMAKE_BUILD_TYPE=Release -D LLVM_ENABLE_PROJECTS="clang;clang-tools-extra" -D LLVM_ENABLE_ASSERTIONS=ON -DLLVM_LIT_ARGS="-v --xunit-xml-output test-results.xml" -D LLVM_ENABLE_DIA_SDK=OFF --trace 2>&1 | %{ "$_" } #} -ErrorAction Stop # LLVM_ENABLE_DIA_SDK=OFF is a workaround to make the tests pass.