diff options
| author | Guilherme Gallo <guilherme.gallo@collabora.com> | 2023-03-15 08:31:13 -0300 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-03-24 21:58:22 +0000 |
| commit | 2112d8b1f28ef695ef52d78dd80258f508197bc1 (patch) | |
| tree | 920caa3581a4bd1e0ab7030ec1bc7962f7901831 /.gitlab-ci | |
| parent | f868c1727ddba842ef1b72acbaf1c656473b5fd4 (diff) | |
ci: Improve piglit-traces "no-perf" filter
We filter out traces that work only in standard replay mode but not
profile one via yq (jq for YAML) manipulation.
The previous query needed to be fixed in some scenarios, such as traces
labeled with only `["no-perf"]`, which was being ignored by the query.
This commit updates the yq query with newer syntax to cover all current
cases (at least for freedreno).
Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22065>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/piglit/piglit-traces.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index 864ca78bd6d..8b42916baf8 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -12,8 +12,8 @@ if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then # workaround for older Debian Bullseye libyaml 0.2.2 sed -i "/^%YAML 1\.2$/d" "$PIGLIT_REPLAY_DESCRIPTION_FILE" - yq -i -Y '. | del(.traces[][] | select(.label[0,1,2,3,4,5,6,7,8,9] == "no-perf"))' \ - "$PIGLIT_REPLAY_DESCRIPTION_FILE" # label positions are a bit hack + yq -iY 'del(.traces[][] | select(.label[]? == "no-perf"))' \ + "$PIGLIT_REPLAY_DESCRIPTION_FILE" fi # WINE |