mirror of
https://github.com/harfbuzz/harfbuzz.git
synced 2025-04-05 13:35:06 +00:00
[test/fuzzing] Simplify Python scripts further
We always path the fuzzer path in meson, so we don’t need to search for fuzzer path in the scripts, and then we can use one script for all the fuzzers.
This commit is contained in:
Khaled Hosny
parent
c29b1de39f
commit
4c43fdcd07
6 changed files with 23 additions and 200 deletions
|
|
@ -4,6 +4,7 @@ import sys
|
|||
import subprocess
|
||||
import tempfile
|
||||
|
||||
|
||||
def run_command(command):
|
||||
"""
|
||||
Run a command, capturing potentially large output in a temp file.
|
||||
|
|
@ -16,6 +17,7 @@ def run_command(command):
|
|||
output = tempf.read().decode("utf-8", errors="replace")
|
||||
return output, p.returncode
|
||||
|
||||
|
||||
def chunkify(lst, chunk_size=64):
|
||||
"""
|
||||
Yield successive chunk_size-sized slices from lst.
|
||||
|
|
@ -23,22 +25,6 @@ def chunkify(lst, chunk_size=64):
|
|||
for i in range(0, len(lst), chunk_size):
|
||||
yield lst[i:i + chunk_size]
|
||||
|
||||
def find_fuzzer_binary(default_path, argv):
|
||||
"""
|
||||
If default_path exists, return it;
|
||||
otherwise check argv[1] for a user-supplied binary path;
|
||||
otherwise exit with an error.
|
||||
"""
|
||||
if os.path.exists(default_path):
|
||||
return default_path
|
||||
|
||||
if len(argv) > 1 and os.path.exists(argv[1]):
|
||||
return argv[1]
|
||||
|
||||
sys.exit(
|
||||
f"Failed to find {os.path.basename(default_path)} binary.\n"
|
||||
"Please provide it as the first argument to the tool."
|
||||
)
|
||||
|
||||
def gather_files(directory):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -34,45 +34,42 @@ foreach file_name : tests
|
|||
set_variable('@0@_exe'.format(test_name.underscorify()), exe)
|
||||
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-fuzzer-tests.py'),
|
||||
args: [
|
||||
hb_shape_fuzzer_exe,
|
||||
meson.current_source_dir() / 'fonts',
|
||||
],
|
||||
depends: [hb_shape_fuzzer_exe, libharfbuzz, libharfbuzz_subset],
|
||||
workdir: meson.current_build_dir() / '..' / '..',
|
||||
env: env,
|
||||
priority: 1,
|
||||
suite: ['fuzzing'],
|
||||
)
|
||||
|
||||
test('subset-fuzzer', find_program('run-subset-fuzzer-tests.py'),
|
||||
test('subset-fuzzer', find_program('run-fuzzer-tests.py'),
|
||||
args: [
|
||||
hb_subset_fuzzer_exe,
|
||||
meson.current_source_dir() / 'fonts',
|
||||
],
|
||||
workdir: meson.current_build_dir() / '..' / '..',
|
||||
env: env,
|
||||
priority: 1,
|
||||
suite: ['fuzzing'],
|
||||
)
|
||||
|
||||
test('repacker-fuzzer', find_program('run-repacker-fuzzer-tests.py'),
|
||||
test('repacker-fuzzer', find_program('run-fuzzer-tests.py'),
|
||||
args: [
|
||||
hb_repacker_fuzzer_exe,
|
||||
meson.current_source_dir() / 'fonts',
|
||||
],
|
||||
workdir: meson.current_build_dir() / '..' / '..',
|
||||
env: env,
|
||||
priority: 1,
|
||||
suite: ['fuzzing'],
|
||||
)
|
||||
|
||||
test('draw-fuzzer', find_program('run-draw-fuzzer-tests.py'),
|
||||
test('draw-fuzzer', find_program('run-fuzzer-tests.py'),
|
||||
args: [
|
||||
hb_draw_fuzzer_exe,
|
||||
meson.current_source_dir() / 'fonts',
|
||||
],
|
||||
workdir: meson.current_build_dir() / '..' / '..',
|
||||
env: env,
|
||||
suite: ['fuzzing'],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,25 +2,21 @@
|
|||
|
||||
import sys
|
||||
import os
|
||||
from hb_fuzzer_tools import (
|
||||
run_command,
|
||||
chunkify,
|
||||
find_fuzzer_binary,
|
||||
gather_files
|
||||
)
|
||||
from hb_fuzzer_tools import run_command, chunkify, gather_files
|
||||
|
||||
|
||||
def main():
|
||||
srcdir = os.getenv("srcdir", ".")
|
||||
top_builddir = os.getenv("top_builddir", ".")
|
||||
|
||||
# Find the fuzzer binary
|
||||
default_bin = os.path.join(top_builddir, "hb-draw-fuzzer")
|
||||
hb_draw_fuzzer = find_fuzzer_binary(default_bin, sys.argv)
|
||||
assert len(sys.argv) > 2, "Please provide fuzzer binary and fonts directory paths."
|
||||
assert os.path.exists(sys.argv[1]), "The fuzzer binary does not exist."
|
||||
assert os.path.exists(sys.argv[2]), "The fonts directory does not exist."
|
||||
|
||||
print("Using hb_draw_fuzzer:", hb_draw_fuzzer)
|
||||
fuzzer = sys.argv[1]
|
||||
fonts_dir = sys.argv[2]
|
||||
|
||||
print("Using fuzzer:", fuzzer)
|
||||
|
||||
# Gather all files from fonts/
|
||||
fonts_dir = os.path.join(srcdir, "fonts")
|
||||
files_to_test = gather_files(fonts_dir)
|
||||
|
||||
if not files_to_test:
|
||||
|
|
@ -33,7 +29,7 @@ def main():
|
|||
# Run in batches of up to 64 files
|
||||
for chunk in chunkify(files_to_test, 64):
|
||||
batch_index += 1
|
||||
cmd_line = [hb_draw_fuzzer] + chunk
|
||||
cmd_line = [fuzzer] + chunk
|
||||
output, returncode = run_command(cmd_line)
|
||||
|
||||
if output.strip():
|
||||
|
|
@ -44,9 +40,10 @@ def main():
|
|||
fails += 1
|
||||
|
||||
if fails > 0:
|
||||
sys.exit(f"{fails} draw fuzzer batch(es) failed.")
|
||||
sys.exit(f"{fails} fuzzer batch(es) failed.")
|
||||
|
||||
print("All fuzzer tests passed successfully.")
|
||||
|
||||
print("All draw fuzzer tests passed successfully.")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
import sys
|
||||
import os
|
||||
from hb_fuzzer_tools import (
|
||||
run_command,
|
||||
chunkify,
|
||||
find_fuzzer_binary,
|
||||
gather_files
|
||||
)
|
||||
|
||||
def main():
|
||||
srcdir = os.getenv("srcdir", ".")
|
||||
top_builddir = os.getenv("top_builddir", ".")
|
||||
|
||||
# Find the fuzzer binary
|
||||
default_bin = os.path.join(top_builddir, "hb-repacker-fuzzer")
|
||||
hb_repacker_fuzzer = find_fuzzer_binary(default_bin, sys.argv)
|
||||
|
||||
print("Using hb_repacker_fuzzer:", hb_repacker_fuzzer)
|
||||
|
||||
# Gather all files from graphs/
|
||||
graphs_dir = os.path.join(srcdir, "graphs")
|
||||
files_to_test = gather_files(graphs_dir)
|
||||
|
||||
if not files_to_test:
|
||||
print("No files found in", graphs_dir)
|
||||
sys.exit(0)
|
||||
|
||||
fails = 0
|
||||
batch_index = 0
|
||||
|
||||
# Run in batches of up to 64 files
|
||||
for chunk in chunkify(files_to_test, 64):
|
||||
batch_index += 1
|
||||
cmd_line = [hb_repacker_fuzzer] + chunk
|
||||
output, returncode = run_command(cmd_line)
|
||||
|
||||
if output.strip():
|
||||
print(output)
|
||||
|
||||
if returncode != 0:
|
||||
print(f"Failure in batch #{batch_index}")
|
||||
fails += 1
|
||||
|
||||
if fails > 0:
|
||||
sys.exit(f"{fails} repacker fuzzer batch(es) failed.")
|
||||
|
||||
print("All repacker fuzzer tests passed successfully.")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
import sys
|
||||
import os
|
||||
from hb_fuzzer_tools import (
|
||||
run_command,
|
||||
chunkify,
|
||||
find_fuzzer_binary,
|
||||
gather_files
|
||||
)
|
||||
|
||||
def main():
|
||||
srcdir = os.getenv("srcdir", ".")
|
||||
top_builddir = os.getenv("top_builddir", ".")
|
||||
|
||||
default_bin = os.path.join(top_builddir, "hb-shape-fuzzer")
|
||||
hb_shape_fuzzer = find_fuzzer_binary(default_bin, sys.argv)
|
||||
|
||||
print("Using hb_shape_fuzzer:", hb_shape_fuzzer)
|
||||
|
||||
# Gather all files from fonts/
|
||||
fonts_dir = os.path.join(srcdir, "fonts")
|
||||
files_to_test = gather_files(fonts_dir)
|
||||
|
||||
if not files_to_test:
|
||||
print("No files found in", fonts_dir)
|
||||
sys.exit(0)
|
||||
|
||||
fails = 0
|
||||
batch_index = 0
|
||||
|
||||
# Batch up to 64 files at a time
|
||||
for chunk in chunkify(files_to_test, 64):
|
||||
batch_index += 1
|
||||
cmd_line = [hb_shape_fuzzer] + chunk
|
||||
output, returncode = run_command(cmd_line)
|
||||
|
||||
if output.strip():
|
||||
print(output)
|
||||
|
||||
if returncode != 0:
|
||||
print(f"Failure in batch #{batch_index}")
|
||||
fails += 1
|
||||
|
||||
if fails > 0:
|
||||
sys.exit(f"{fails} shape fuzzer batch(es) failed.")
|
||||
|
||||
print("All shape fuzzer tests passed successfully.")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
import sys
|
||||
import os
|
||||
from hb_fuzzer_tools import (
|
||||
run_command,
|
||||
chunkify,
|
||||
find_fuzzer_binary,
|
||||
gather_files
|
||||
)
|
||||
|
||||
def main():
|
||||
srcdir = os.getenv("srcdir", ".")
|
||||
top_builddir = os.getenv("top_builddir", ".")
|
||||
|
||||
# Locate the binary
|
||||
default_bin = os.path.join(top_builddir, "hb-subset-fuzzer")
|
||||
hb_subset_fuzzer = find_fuzzer_binary(default_bin, sys.argv)
|
||||
|
||||
print("Using hb_subset_fuzzer:", hb_subset_fuzzer)
|
||||
|
||||
# Gather from two directories, then combine
|
||||
dir1 = os.path.join(srcdir, "..", "subset", "data", "fonts")
|
||||
dir2 = os.path.join(srcdir, "fonts")
|
||||
|
||||
files_to_test = gather_files(dir1) + gather_files(dir2)
|
||||
|
||||
if not files_to_test:
|
||||
print("No files found in either directory.")
|
||||
sys.exit(0)
|
||||
|
||||
fails = 0
|
||||
batch_index = 0
|
||||
|
||||
# Batch the tests in up to 64 files per run
|
||||
for chunk in chunkify(files_to_test, 64):
|
||||
batch_index += 1
|
||||
cmd_line = [hb_subset_fuzzer] + chunk
|
||||
output, returncode = run_command(cmd_line)
|
||||
|
||||
if output.strip():
|
||||
print(output)
|
||||
|
||||
if returncode != 0:
|
||||
print(f"Failure in batch #{batch_index}")
|
||||
fails += 1
|
||||
|
||||
if fails > 0:
|
||||
sys.exit(f"{fails} subset fuzzer batch(es) failed.")
|
||||
|
||||
print("All subset fuzzer tests passed successfully.")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Loading…
Add table
Reference in a new issue