Module: Mesa Branch: staging/21.3 Commit: 8217f5e97d5d2f9e6e974713d630d6957e33b252 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8217f5e97d5d2f9e6e974713d630d6957e33b252
Author: Emma Anholt <[email protected]> Date: Thu Oct 14 14:15:18 2021 -0700 ci/piglit-runner: Fix funny indentation of the piglit-runner command. Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13372> (cherry picked from commit bd81a236205e080ee2c68d6f0f7dbf82e26bcd20) --- .gitlab-ci/piglit/piglit-runner.sh | 22 +++++++++++----------- .pick_status.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index 33ad309a4e0..e716ed63257 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -53,17 +53,17 @@ fi set +e - piglit-runner \ - run \ - --piglit-folder /piglit \ - --output $RESULTS \ - --jobs ${FDO_CI_CONCURRENT:-4} \ - --skips $INSTALL/piglit/piglit-all-skips.txt $PIGLIT_SKIPS \ - --flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt \ - --profile $PIGLIT_PROFILES \ - --process-isolation \ - $PIGLIT_RUNNER_OPTIONS \ - -v -v +piglit-runner \ + run \ + --piglit-folder /piglit \ + --output $RESULTS \ + --jobs ${FDO_CI_CONCURRENT:-4} \ + --skips $INSTALL/piglit/piglit-all-skips.txt $PIGLIT_SKIPS \ + --flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt \ + --profile $PIGLIT_PROFILES \ + --process-isolation \ + $PIGLIT_RUNNER_OPTIONS \ + -v -v PIGLIT_EXITCODE=$? diff --git a/.pick_status.json b/.pick_status.json index 06c746bfd45..ea15612000d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4045,7 +4045,7 @@ "description": "ci/piglit-runner: Fix funny indentation of the piglit-runner command.", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null },
