From bb9f69d8b2bcbeed9789e235b4d8488570570b70 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 9 Feb 2024 20:22:35 +0000 Subject: [PATCH] Revert "ci: Remove not-printable chars from generated junit file" This reverts commit 94273b0ebf10accde2703cc72e505043d1749e26. Meson 1.2.0 contains a fix for the underlying issue (in commit bd3d2cf91894b1f91128011b2cf56a5bd2c326ae), and we now depend on 1.2.0. So the workaround is no longer needed. Signed-off-by: Philip Withnall --- .gitlab-ci/test-msvc.bat | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index 09ba13c48..02f8b0753 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -19,17 +19,8 @@ meson compile -C _build || goto :error meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --setup=unstable_tests --suite=failing --suite=flaky -:: Workaround meson issue https://github.com/mesonbuild/meson/issues/9894 -python -c "n = '_build/meson-logs/testlog.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" || goto :error -python -c "n = '_build/meson-logs/testlog-unstable_tests.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" - :: FIXME: can we get code coverage support? goto :EOF :error - -:: Workaround meson issue https://github.com/mesonbuild/meson/issues/9894 -python -c "n = '_build/meson-logs/testlog.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" -python -c "n = '_build/meson-logs/testlog-unstable_tests.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" - exit /b 1