[test] Remove timeout from test runners

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.
This commit is contained in:
Khaled Hosny 2020-10-13 20:21:28 +02:00 committed by Behdad Esfahbod
parent 3232e6f2a9
commit 84dd65a874
5 changed files with 4 additions and 5 deletions

View File

@ -90,7 +90,7 @@ jobs:
- run: meson build --buildtype=debugoptimized - run: meson build --buildtype=debugoptimized
- run: ninja -Cbuild -j9 - run: ninja -Cbuild -j9
# TOOD: increase timeouts and remove --no-suite=slow # 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: alpine:
docker: docker:

View File

@ -31,7 +31,6 @@ endforeach
env = environment() env = environment()
env.set('srcdir', meson.current_source_dir()) 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'), test('shape_fuzzer', find_program('run-shape-fuzzer-tests.py'),
args: [ args: [

View File

@ -9,7 +9,7 @@ def cmd (command):
p = subprocess.Popen (command, stderr=tempf) p = subprocess.Popen (command, stderr=tempf)
try: try:
p.wait (timeout=int (os.getenv ("HB_TEST_SHAPE_FUZZER_TIMEOUT", "2"))) p.wait ()
tempf.seek (0) tempf.seek (0)
text = tempf.read () text = tempf.read ()

View File

@ -9,7 +9,7 @@ def cmd (command):
p = subprocess.Popen (command, stderr=tempf) p = subprocess.Popen (command, stderr=tempf)
try: try:
p.wait (timeout=int (os.getenv ("HB_TEST_SHAPE_FUZZER_TIMEOUT", "2"))) p.wait ()
tempf.seek (0) tempf.seek (0)
text = tempf.read () text = tempf.read ()

View File

@ -9,7 +9,7 @@ def cmd (command):
p = subprocess.Popen (command, stderr=tempf) p = subprocess.Popen (command, stderr=tempf)
try: try:
p.wait (timeout=int (os.getenv ("HB_TEST_SUBSET_FUZZER_TIMEOUT", "12"))) p.wait ()
tempf.seek (0) tempf.seek (0)
text = tempf.read () text = tempf.read ()