From 6738ee3d1bf10114b009449277b4fd6727c1a88f Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sun, 9 Feb 2025 13:30:19 +0000
Subject: [PATCH] [ci/fedora-valgrind] Add time multiplier of 10 and run slow
 tests

---
 .circleci/config.yml                      |  3 +--
 test/fuzzing/meson.build                  | 16 +++++++---------
 test/fuzzing/run-repacker-fuzzer-tests.py |  0
 3 files changed, 8 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 test/fuzzing/run-repacker-fuzzer-tests.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5eae8d26d..51ed1a95e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -56,8 +56,7 @@ jobs:
       - run: dnf install -y pkg-config ragel valgrind gcc gcc-c++ meson git glib2-devel freetype-devel cairo-devel libicu-devel gobject-introspection-devel graphite2-devel redhat-rpm-config python python-pip || true
       - run: meson setup build --buildtype=debugoptimized
       - run: meson compile -Cbuild -j9
-      # TOOD: increase timeouts and remove --no-suite=slow
-      - run: RUN_VALGRIND=1 meson test -Cbuild --no-suite=slow --wrap='valgrind --leak-check=full --error-exitcode=1' --print-errorlogs --num-processes=$(($(nproc)/2 + 1))
+      - run: RUN_VALGRIND=1 meson test -Cbuild -t 10 --no-suite=slow --wrap='valgrind --leak-check=full --error-exitcode=1' --print-errorlogs --num-processes=$(($(nproc)/2 + 1))
 
   alpine:
     docker:
diff --git a/test/fuzzing/meson.build b/test/fuzzing/meson.build
index 7d64987df..f6ebbddcf 100644
--- a/test/fuzzing/meson.build
+++ b/test/fuzzing/meson.build
@@ -37,11 +37,11 @@ endforeach
 env = environment()
 env.set('srcdir', meson.current_source_dir())
 
-test('shape_fuzzer', find_program('run-shape-fuzzer-tests.py'),
+test('shape-fuzzer', find_program('run-shape-fuzzer-tests.py'),
   args: [
     hb_shape_fuzzer_exe,
   ],
-  timeout: 300,
+  timeout: 90,
   depends: [hb_shape_fuzzer_exe, libharfbuzz, libharfbuzz_subset],
   workdir: meson.current_build_dir() / '..' / '..',
   env: env,
@@ -49,33 +49,31 @@ test('shape_fuzzer', find_program('run-shape-fuzzer-tests.py'),
   suite: ['fuzzing', 'slow'],
 )
 
-test('subset_fuzzer', find_program('run-subset-fuzzer-tests.py'),
+test('subset-fuzzer', find_program('run-subset-fuzzer-tests.py'),
   args: [
     hb_subset_fuzzer_exe,
   ],
-  timeout: 300,
+  timeout: 90,
   workdir: meson.current_build_dir() / '..' / '..',
   env: env,
   priority: 1,
   suite: ['fuzzing', 'slow'],
 )
 
-test('repacker_fuzzer', find_program('run-repacker-fuzzer-tests.py'),
+test('repacker-fuzzer', find_program('run-repacker-fuzzer-tests.py'),
   args: [
     hb_repacker_fuzzer_exe,
   ],
-  timeout: 300,
   workdir: meson.current_build_dir() / '..' / '..',
   env: env,
   priority: 1,
-  suite: ['fuzzing', 'slow'],
+  suite: ['fuzzing'],
 )
 
-test('draw_fuzzer', find_program('run-draw-fuzzer-tests.py'),
+test('draw-fuzzer', find_program('run-draw-fuzzer-tests.py'),
   args: [
     hb_draw_fuzzer_exe,
   ],
-  timeout: 300,
   workdir: meson.current_build_dir() / '..' / '..',
   env: env,
   suite: ['fuzzing'],
diff --git a/test/fuzzing/run-repacker-fuzzer-tests.py b/test/fuzzing/run-repacker-fuzzer-tests.py
old mode 100644
new mode 100755