From f1957b49b2d01a9d063aed4000f985b220e30fa0 Mon Sep 17 00:00:00 2001
From: Eric Soroos <eric-github@soroos.net>
Date: Fri, 16 May 2025 12:08:45 +0200
Subject: [PATCH] Xfail timouts in Valgrind tests

* ensure that the env variable is set in the makefile
---
 Makefile                   | 4 ++--
 Tests/test_file_jpeg.py    | 5 +++++
 Tests/test_imagefontpil.py | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index bdddecda5..82c2c085f 100644
--- a/Makefile
+++ b/Makefile
@@ -95,14 +95,14 @@ test:
 .PHONY: valgrind
 valgrind:
 	python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind
-	PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp --leak-check=no \
+	PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp --leak-check=no \
             --log-file=/tmp/valgrind-output \
             python3 -m pytest --no-memcheck -vv --valgrind --valgrind-log=/tmp/valgrind-output
 
 .PHONY: valgrind-leak
 valgrind-leak:
 	python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind
-	PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp \
+	PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp \
 	    --leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite \
             --log-file=/tmp/valgrind-output \
             python3 -m pytest -vv --valgrind --valgrind-log=/tmp/valgrind-output Tests/
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index 79f0ec1a8..fb9f26fc7 100644
--- a/Tests/test_file_jpeg.py
+++ b/Tests/test_file_jpeg.py
@@ -1034,6 +1034,11 @@ class TestFileJpeg:
             im.save(f, xmp=b"1" * 65505)
 
     @pytest.mark.timeout(timeout=1)
+    @pytest.mark.xfail(
+        "PILLOW_VALGRIND_TEST" in os.environ,
+        reason="Valgrind is slower",
+        raises=TimeoutError
+    )
     def test_eof(self, monkeypatch: pytest.MonkeyPatch) -> None:
         # Even though this decoder never says that it is finished
         # the image should still end when there is no new data
diff --git a/Tests/test_imagefontpil.py b/Tests/test_imagefontpil.py
index 695aecbde..adce4a75c 100644
--- a/Tests/test_imagefontpil.py
+++ b/Tests/test_imagefontpil.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import struct
 from io import BytesIO
+import os
 
 import pytest
 
@@ -73,6 +74,11 @@ def test_decompression_bomb() -> None:
 
 
 @pytest.mark.timeout(4)
+@pytest.mark.xfail(
+    "PILLOW_VALGRIND_TEST" in os.environ,
+    reason="Valgrind is slower",
+    raises=TimeoutError
+)
 def test_oom() -> None:
     glyph = struct.pack(
         ">hhhhhhhhhh", 1, 0, -32767, -32767, 32767, 32767, -32767, -32767, 32767, 32767