summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorUli Schlachter <psychon@znc.in>2021-06-03 17:19:17 +0200
committerUli Schlachter <psychon@znc.in>2021-06-03 17:19:17 +0200
commit47c70d53e48a9ce74b6cbb64d0dffe0b96bc7ad6 (patch)
treeaaa61ebc8a3caa91739a79c811fe068f12d95033 /.gitlab-ci.yml
parent9c9883cac0052c4786cd244b9a27c60d9d76245f (diff)
downloadcairo-47c70d53e48a9ce74b6cbb64d0dffe0b96bc7ad6.tar.gz
Switch to line-separated test failure lists
Having comma separated lists of test names that we expect to fail leads to really unreadable and useless diffs. Thus, this commit changes these lists to be separated by newlines. This change was generated with: ( cd .gitlab-ci ; for x in * ; do tr ',' '\n' < $x > .$x ; mv .$x $x ; done ) The code in .gitlab-ci.yml is changed to use tr again to transfer these lists back so that everything still works. Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml48
1 files changed, 24 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1eb93e5bd..52db4de47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,28 +104,28 @@ fedora autotools build:
# Current test failures that we ignore for now
- export CAIRO_TEST_UGLY_HACK_TO_SOMETIMES_IGNORE_SCRIPT_XCB_HUGE_IMAGE_SHM=1
- export CAIRO_TEST_UGLY_HACK_TO_IGNORE_CREATE_FOR_STREAM=1
- - export CAIRO_TEST_IGNORE_pdf_argb32=$(cat .gitlab-ci/ignore-pdf-argb32.txt)
- - export CAIRO_TEST_IGNORE_pdf_rgb24=$(cat .gitlab-ci/ignore-pdf-rgb24.txt)
- - export CAIRO_TEST_IGNORE_script_argb32=$(cat .gitlab-ci/ignore-script-argb32.txt)
- - export CAIRO_TEST_IGNORE_image_argb32=$(cat .gitlab-ci/ignore-image-argb32.txt)
- - export CAIRO_TEST_IGNORE_image_rgb24=$(cat .gitlab-ci/ignore-image-rgb24.txt)
- - export CAIRO_TEST_IGNORE_image16_rgb24=$(cat .gitlab-ci/ignore-image16-rgb24.txt)
- - export CAIRO_TEST_IGNORE_recording_argb32=$(cat .gitlab-ci/ignore-recording-argb32.txt)
- - export CAIRO_TEST_IGNORE_recording_rgb24=$(cat .gitlab-ci/ignore-recording-rgb24.txt)
- - export CAIRO_TEST_IGNORE_svg11_argb32=$(cat .gitlab-ci/ignore-svg11-argb32.txt)
- - export CAIRO_TEST_IGNORE_svg11_rgb24=$(cat .gitlab-ci/ignore-svg11-rgb24.txt)
- - export CAIRO_TEST_IGNORE_xcb_argb32=$(cat .gitlab-ci/ignore-xcb-argb32.txt)
- - export CAIRO_TEST_IGNORE_xcb_rgb24=$(cat .gitlab-ci/ignore-xcb-rgb24.txt)
- - export CAIRO_TEST_IGNORE_xcb_window_rgb24=$(cat .gitlab-ci/ignore-xcb-window-rgb24.txt)
- - export CAIRO_TEST_IGNORE_xcb_window__rgb24=$(cat '.gitlab-ci/ignore-xcb-window&-rgb24.txt')
- - export CAIRO_TEST_IGNORE_xcb_render_0_0_argb32=$(cat .gitlab-ci/ignore-xcb-render-0-0-argb32.txt)
- - export CAIRO_TEST_IGNORE_xcb_render_0_0_rgb24=$(cat .gitlab-ci/ignore-xcb-render-0-0-rgb24.txt)
- - export CAIRO_TEST_IGNORE_xcb_fallback_rgb24=$(cat .gitlab-ci/ignore-xcb-fallback-rgb24.txt)
- - export CAIRO_TEST_IGNORE_xlib_argb32=$(cat .gitlab-ci/ignore-xlib-argb32.txt)
- - export CAIRO_TEST_IGNORE_xlib_rgb24=$(cat .gitlab-ci/ignore-xlib-rgb24.txt)
- - export CAIRO_TEST_IGNORE_xlib_window_rgb24=$(cat .gitlab-ci/ignore-xlib-window-rgb24.txt)
- - export CAIRO_TEST_IGNORE_xlib_render_0_0_rgb24=$(cat .gitlab-ci/ignore-xlib-render-0-0-rgb24.txt)
- - export CAIRO_TEST_IGNORE_xlib_fallback_rgb24=$(cat .gitlab-ci/ignore-xlib-fallback-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_pdf_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-pdf-argb32.txt)
+ - export CAIRO_TEST_IGNORE_pdf_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-pdf-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_script_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-script-argb32.txt)
+ - export CAIRO_TEST_IGNORE_image_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-image-argb32.txt)
+ - export CAIRO_TEST_IGNORE_image_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-image-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_image16_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-image16-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_recording_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-recording-argb32.txt)
+ - export CAIRO_TEST_IGNORE_recording_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-recording-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_svg11_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-svg11-argb32.txt)
+ - export CAIRO_TEST_IGNORE_svg11_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-svg11-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_xcb_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-argb32.txt)
+ - export CAIRO_TEST_IGNORE_xcb_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_xcb_window_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-window-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_xcb_window__rgb24=$(tr '\n' ',' < '.gitlab-ci/ignore-xcb-window&-rgb24.txt')
+ - export CAIRO_TEST_IGNORE_xcb_render_0_0_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-render-0-0-argb32.txt)
+ - export CAIRO_TEST_IGNORE_xcb_render_0_0_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-render-0-0-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_xcb_fallback_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-fallback-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_xlib_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-argb32.txt)
+ - export CAIRO_TEST_IGNORE_xlib_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_xlib_window_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-window-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_xlib_render_0_0_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-render-0-0-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_xlib_fallback_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-fallback-rgb24.txt)
- export CAIRO_BOILERPLATE_OPEN_NO_DAEMON=1
- export CAIRO_BOILERPLATE_DO_NOT_CRASH_ON_ANY2PPM_ERROR=1
- export ANY2PPM="timeout 3m ./any2ppm"
@@ -288,7 +288,7 @@ meson macOS:
- meson setup -Dpixman:tests=disabled build
- meson compile --verbose -C build
# Test cairo-quartz. Other backends should be covered by other jobs
- - export CAIRO_TEST_IGNORE_quartz_argb32=$(cat .gitlab-ci/ignore-quartz-argb32.txt)
- - export CAIRO_TEST_IGNORE_quartz_rgb24=$(cat .gitlab-ci/ignore-quartz-rgb24.txt)
+ - export CAIRO_TEST_IGNORE_quartz_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-quartz-argb32.txt)
+ - export CAIRO_TEST_IGNORE_quartz_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-quartz-rgb24.txt)
- export CAIRO_TEST_TARGET=quartz
- (cd build/test && srcdir=../../test ./cairo-test-suite)