From 9eea5213910e691a5bc8183bb18d6b68aa8a4525 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 11 Dec 2020 10:05:14 +0100 Subject: [PATCH] gitlab-ci: copy piglit expected results to artifacts I somehow missed this while reworking the CI bits to reduce bandwidth usage. This emits an error on stdout, but doesn't actually fail the tests. Fixes: 195a001d736 ("gitlab-ci: do not clone git-repo for test-job") Reviewed-by: Daniel Stone Part-of: --- .gitlab-ci/windows/mesa_build.ps1 | 1 + .gitlab-ci/windows/piglit_run.ps1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 index e6106275068..e290060a112 100644 --- a/.gitlab-ci/windows/mesa_build.ps1 +++ b/.gitlab-ci/windows/mesa_build.ps1 @@ -19,3 +19,4 @@ if (!$buildstatus) { } Copy-Item ".\.gitlab-ci\windows\piglit_run.ps1" -Destination $installdir +Copy-Item ".\.gitlab-ci\windows\quick_gl.txt" -Destination $installdir diff --git a/.gitlab-ci/windows/piglit_run.ps1 b/.gitlab-ci/windows/piglit_run.ps1 index cdbfa5ee1bb..705d8bdf20b 100644 --- a/.gitlab-ci/windows/piglit_run.ps1 +++ b/.gitlab-ci/windows/piglit_run.ps1 @@ -7,7 +7,7 @@ cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd6 py -3 C:\Piglit\bin\piglit.py summary console .\results | Select -SkipLast 1 | Select-String -NotMatch -Pattern ': pass' | Set-Content -Path .\result.txt -$diff = Compare-Object -ReferenceObject $(Get-Content ".gitlab-ci\windows\$env:PIGLIT_PROFILE.txt") ` +$diff = Compare-Object -ReferenceObject $(Get-Content ".\_install\$env:PIGLIT_PROFILE.txt") ` -DifferenceObject $(Get-Content .\result.txt) if (-Not $diff) { Exit 0