From 250a6e7b6f03ec10ddf3d75c307f373357dd622f Mon Sep 17 00:00:00 2001 From: John Turner Date: Tue, 16 Dec 2025 00:33:47 +0000 Subject: [PATCH] ci: fuzz: clean up fuzzer script a bit --- .gitea/workflows/gentoo-utils.yml | 2 +- scripts/atom_parser_fuzz.sh | 15 +++++++++++++++ scripts/fuzz.sh | 22 ---------------------- 3 files changed, 16 insertions(+), 23 deletions(-) create mode 100755 scripts/atom_parser_fuzz.sh delete mode 100755 scripts/fuzz.sh diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml index cd150c3..968bac4 100644 --- a/.gitea/workflows/gentoo-utils.yml +++ b/.gitea/workflows/gentoo-utils.yml @@ -154,7 +154,7 @@ jobs: which emerge meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized build meson compile atom_parser_fuzzer:alias -C build - timeout 10m ./scripts/fuzz.sh + timeout 10m ./scripts/atom_parser_fuzz.sh continue-on-error: true check-format: diff --git a/scripts/atom_parser_fuzz.sh b/scripts/atom_parser_fuzz.sh new file mode 100755 index 0000000..3222a51 --- /dev/null +++ b/scripts/atom_parser_fuzz.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +in=$(mktemp -u) || exit $? +out=$(mktemp -u) || exit $? + +mkfifo ${in} ${out} || exit $? + +./scripts/atom.py <${in} >${out} \ + | ./build/fuzz/atom/parser/fuzzer >${in} <${out} \ + ./build/atom_parser_fuzzer_corpus \ + -max_total_time=${FUZZER_TIMEOUT_S:-600} \ + -only_ascii=1 \ + -timeout=2 \ + -timeout_exitcode=0 \ + "$@" diff --git a/scripts/fuzz.sh b/scripts/fuzz.sh deleted file mode 100755 index e6550c3..0000000 --- a/scripts/fuzz.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -CWD="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -PROJECT_DIR=$(realpath "${CWD}/../") - -in=$(mktemp -u) || exit $? -out=$(mktemp -u) || exit $? - -mkfifo ${in} ${out} || exit $? - -if [[ -z "$FUZZER_TIMEOUT_S" ]]; then - FUZZER_TIMEOUT_S=600 -fi - - -${PROJECT_DIR}/scripts/atom.py <${in} >${out} \ - | ${PROJECT_DIR}/build/fuzz/atom/parser/fuzzer -max_total_time=$FUZZER_TIMEOUT_S >${in} <${out} \ - ${PROJECT_DIR}/build/atom_parser_fuzzer_corpus \ - -only_ascii=1 \ - -timeout=2 \ - -max_total_time=$FUZZER_TIMEOUT_S \ - -timeout_exitcode=0 \ - "$@"