summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmma Anholt <emma@anholt.net>2021-10-14 14:15:18 -0700
committerEric Engestrom <eric@engestrom.ch>2021-11-10 21:57:57 +0000
commitc8b1a34dafba47baf2dd2794878a34e5b669bb3b (patch)
tree7a92dd257d014ed5faaa9160e42471e2408ac848
parentf7206f1cdea83719077399995324d38d4b84d9fc (diff)
ci/piglit-runner: Fix funny indentation of the piglit-runner command.
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13372> (cherry picked from commit bd81a236205e080ee2c68d6f0f7dbf82e26bcd20)
-rwxr-xr-x.gitlab-ci/piglit/piglit-runner.sh22
-rw-r--r--.pick_status.json2
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 d7482f49dd2..c9f4f1fbc28 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5377,7 +5377,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
},