Merge remote-tracking branch 'origin/5.13' into dev

This reverts commit d494d76c26df48c9cf3b45fc15ebad963fe34c52.

 Conflicts:
        coin/platform_configs/default.yaml
                Temporarily remove the -no-opengl build.
        coin/platform_configs/meta-boot2qt.yaml
        coin/platform_configs/qt5.yaml
                Temporarily remove the webassembly build on windows.
        coin/platform_configs/qtwebkit.yaml

Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd

1 files changed, 46 insertions, 2 deletions

diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index 5a7eb674..100f14ae 100644
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -22,14 +22,46 @@ function Run-Executable
         [string]$Executable=$(throw("You must specify a program to run.")),
         [string[]]$Arguments
     )
+
+    $stdoutFile = [System.IO.Path]::GetTempFileName()
+    $stderrFile = [System.IO.Path]::GetTempFileName()
+
     if ([string]::IsNullOrEmpty($Arguments)) {
         Write-Host "Running `"$Executable`""
-        $p = Start-Process -FilePath "$Executable" -Wait -PassThru
+        $p = Start-Process -FilePath "$Executable" -Wait -PassThru `
+            -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile
     } else {
         Write-Host "Running `"$Executable`" with arguments `"$Arguments`""
-        $p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -PassThru
+        $p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -PassThru `
+            -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile
         Wait-Process -InputObject $p
     }
+
+    $stdoutContent = [System.IO.File]::ReadAllText($stdoutFile)
+    $stderrContent = [System.IO.File]::ReadAllText($stderrFile)
+    Remove-Item -Path $stdoutFile, $stderrFile -Force -ErrorAction Ignore
+
+    $hasOutput = $false
+    if ([string]::IsNullOrEmpty($stdoutContent) -eq $false -or [string]::IsNullOrEmpty($stderrContent) -eq $false) {
+        $hasOutput = $true
+        Write-Host
+        Write-Host "======================================================================"
+    }
+    if ([string]::IsNullOrEmpty($stdoutContent) -eq $false) {
+        Write-Host "stdout of `"$Executable`":"
+        Write-Host "======================================================================"
+        Write-Host $stdoutContent
+        Write-Host "======================================================================"
+    }
+    if ([string]::IsNullOrEmpty($stderrContent) -eq $false) {
+        Write-Host "stderr of `"$Executable`":"
+        Write-Host "======================================================================"
+        Write-Host $stderrContent
+        Write-Host "======================================================================"
+    }
+    if ($hasOutput) {
+        Write-Host
+    }
     if ($p.ExitCode -ne 0) {
         throw "Process $($Executable) exited with exit code $($p.ExitCode)"
     }
@@ -136,6 +168,18 @@ function Add-Path
     $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
 }
 
+function Prepend-Path
+{
+    Param (
+        [string]$Path
+    )
+    Write-Host "Adding $Path to Path"
+
+    $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+    [Environment]::SetEnvironmentVariable("Path", "$Path;" + $oldPath, [EnvironmentVariableTarget]::Machine)
+    $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+}
+
 function Set-EnvironmentVariable
 {
     Param (