From 84dd65a8740a91e58eaef43c0006ace3a3aa54a7 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 13 Oct 2020 20:21:28 +0200 Subject: [PATCH] [test] Remove timeout from test runners MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/harfbuzz/harfbuzz/issues/2707#issuecomment-707744079 This wasn’t inconsistent as well, HB_TEST_SUBSET_FUZZER_TIMEOUT defaulted to 12 in the test runner, but it was overridden to 50 in meson.build, and then meson has its own test timeout. --- .circleci/config.yml | 2 +- test/fuzzing/meson.build | 1 - test/fuzzing/run-draw-fuzzer-tests.py | 2 +- test/fuzzing/run-shape-fuzzer-tests.py | 2 +- test/fuzzing/run-subset-fuzzer-tests.py | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d7efa7eae..88158ee0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,7 +90,7 @@ jobs: - run: meson build --buildtype=debugoptimized - run: ninja -Cbuild -j9 # TOOD: increase timeouts and remove --no-suite=slow - - run: RUN_VALGRIND=1 HB_TEST_SHAPE_FUZZER_TIMEOUT=5 meson test -Cbuild --no-suite=slow --wrap='valgrind --leak-check=full --error-exitcode=1' --print-errorlogs + - run: RUN_VALGRIND=1 meson test -Cbuild --no-suite=slow --wrap='valgrind --leak-check=full --error-exitcode=1' --print-errorlogs alpine: docker: diff --git a/test/fuzzing/meson.build b/test/fuzzing/meson.build index 8f698854b..9eaf3fa99 100644 --- a/test/fuzzing/meson.build +++ b/test/fuzzing/meson.build @@ -31,7 +31,6 @@ endforeach env = environment() env.set('srcdir', meson.current_source_dir()) -env.set('HB_TEST_SUBSET_FUZZER_TIMEOUT', '50') test('shape_fuzzer', find_program('run-shape-fuzzer-tests.py'), args: [ diff --git a/test/fuzzing/run-draw-fuzzer-tests.py b/test/fuzzing/run-draw-fuzzer-tests.py index acae7a81d..8b5a2e82d 100755 --- a/test/fuzzing/run-draw-fuzzer-tests.py +++ b/test/fuzzing/run-draw-fuzzer-tests.py @@ -9,7 +9,7 @@ def cmd (command): p = subprocess.Popen (command, stderr=tempf) try: - p.wait (timeout=int (os.getenv ("HB_TEST_SHAPE_FUZZER_TIMEOUT", "2"))) + p.wait () tempf.seek (0) text = tempf.read () diff --git a/test/fuzzing/run-shape-fuzzer-tests.py b/test/fuzzing/run-shape-fuzzer-tests.py index 348d1384f..382f60929 100755 --- a/test/fuzzing/run-shape-fuzzer-tests.py +++ b/test/fuzzing/run-shape-fuzzer-tests.py @@ -9,7 +9,7 @@ def cmd (command): p = subprocess.Popen (command, stderr=tempf) try: - p.wait (timeout=int (os.getenv ("HB_TEST_SHAPE_FUZZER_TIMEOUT", "2"))) + p.wait () tempf.seek (0) text = tempf.read () diff --git a/test/fuzzing/run-subset-fuzzer-tests.py b/test/fuzzing/run-subset-fuzzer-tests.py index 800a43601..da7d1e570 100755 --- a/test/fuzzing/run-subset-fuzzer-tests.py +++ b/test/fuzzing/run-subset-fuzzer-tests.py @@ -9,7 +9,7 @@ def cmd (command): p = subprocess.Popen (command, stderr=tempf) try: - p.wait (timeout=int (os.getenv ("HB_TEST_SUBSET_FUZZER_TIMEOUT", "12"))) + p.wait () tempf.seek (0) text = tempf.read ()