From e4f9969108f7a01d7c37c856e6833b400d0278de Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Wed, 8 Jul 2020 15:10:25 +0430 Subject: [PATCH] [ci] migrate to meson two bots, one bot here (distcheck) and one in travis still run autotools and won't be removed till we decide about autotools --- .circleci/config.yml | 238 +++++++----------------- test/fuzzing/run-draw-fuzzer-tests.py | 6 +- test/fuzzing/run-shape-fuzzer-tests.py | 6 +- test/fuzzing/run-subset-fuzzer-tests.py | 6 +- 4 files changed, 69 insertions(+), 187 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 341f8e5bf..03dec13e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,12 +46,13 @@ jobs: - run: meson compile -Cbuild - run: meson test -Cbuild --print-errorlogs + # will be dropped with autotools removal distcheck: docker: - - image: ubuntu:19.10 + - image: ubuntu:20.04 steps: - checkout - - run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip cmake + - run: apt update && DEBIAN_FRONTEND=noninteractive apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip cmake - run: pip3 install fonttools meson --upgrade - run: ./autogen.sh - run: make -j32 @@ -60,168 +61,72 @@ jobs: - run: cd harfbuzz-* && meson build && ninja -Cbuild test - run: cd harfbuzz-* && cmake -Bcmakebuild -H. && cmake --build cmakebuild - alpine-O3-Os-NOMMAP: - docker: - - image: alpine - steps: - - checkout - - run: apk update && apk add ragel make pkgconfig libtool autoconf automake gettext gcc g++ glib-dev freetype-dev cairo-dev python3 - # C??FLAGS are not needed for a regular build - - run: CFLAGS="-O3" CXXFLAGS="-O3 -DHB_NO_MMAP" ./autogen.sh - - run: make -j32 - - run: make check || .ci/fail.sh - - run: make clean - - run: CFLAGS="-Os -DHB_OPTIMIZE_SIZE" CXXFLAGS="-Os -DHB_NO_MMAP -DHB_OPTIMIZE_SIZE" ./autogen.sh - - run: make -j32 - - run: make check || .ci/fail.sh - - archlinux-py3-all: - docker: - - image: archlinux/base - steps: - - checkout - - run: pacman --noconfirm -Syu freetype2 cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python python-pip make which base-devel - - run: pip install flake8 fonttools - - run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics - # C??FLAGS are not needed for a regular build - - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 - - run: make -j32 CPPFLAGS="-Werror" - - run: make check CPPFLAGS="-Werror" || .ci/fail.sh - - clang-O3-O0-and-nobuildsystem: - docker: - - image: ubuntu:19.10 - steps: - - checkout - - run: apt update || true - - run: apt install -y clang wget autoconf automake libtool pkg-config ragel libfreetype6-dev libfontconfig1-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip - - run: pip install fonttools - - run: CFLAGS="-O3" CXXFLAGS="-O3" CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-fontconfig --with-glib --with-cairo --with-icu --with-graphite2 - - run: make -j32 - - run: make check || .ci/fail.sh - - run: make clean - - run: CFLAGS="-O0" CXXFLAGS="-O0" CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-fontconfig --with-glib --with-cairo --with-icu --with-graphite2 - - run: make -j32 - - run: HB_TEST_SUBSET_FUZZER_TIMEOUT=30 make check || .ci/fail.sh - - run: make clean - - run: make -Csrc CPPFLAGS="-DHB_TINY -DHB_NO_OT_FONT" libharfbuzz-subset.la && make clean - - run: clang -c src/harfbuzz.cc -DHB_NO_MT - # -Werror -Werror=deprecated-this-capture can be added but it will confuse contributors so let's skip for now - - run: clang -c src/hb-*.cc -DHB_NO_MT -std=c++2a -fno-exceptions - - gcc-valgrind: - docker: - - image: ubuntu:19.10 - steps: - - checkout - - run: apt update || true - - run: apt install -y gcc binutils libtool autoconf automake make pkg-config gtk-doc-tools ragel libfreetype6-dev libfontconfig1-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip valgrind - - run: pip install fonttools - - run: ./autogen.sh --with-freetype --with-glib --with-cairo --with-icu --with-graphite2 --with-fontconfig - - run: make -j32 - # run-shape-fuzzer-tests.py automatically runs valgrind if see available - # but test/api runs it by request, we probably should normalize the approaches - - run: HB_TEST_SHAPE_FUZZER_TIMEOUT=3 HB_TEST_SUBSET_FUZZER_TIMEOUT=50 RUN_VALGRIND=1 make check && make -Ctest/api check-valgrind || .ci/fail.sh - # informational for now - - run: make -Ctest/api check-symbols || true - - clang-everything: - docker: - - image: ubuntu:19.10 - steps: - - checkout - - run: apt update || true; apt install -y wget gnupg - - run: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - - run: echo "deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdev.list - - run: echo "deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdevsrc.list - - run: apt update || true - - run: apt install -y clang lld binutils libtool autoconf automake make pkg-config gtk-doc-tools ragel libfreetype6-dev libfontconfig1-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip - - run: pip install fonttools - - run: CFLAGS="-Weverything -Wno-reserved-id-macro -Wno-conversion -Wno-padded -Wno-sign-conversion -Wno-cast-qual -Wno-documentation -Wno-documentation-unknown-command -DHB_WITH_WIN1256" CXXFLAGS="-Weverything -Wno-old-style-cast -Wno-documentation -Wno-documentation-unknown-command -Wno-c++98-compat -Wno-cast-qual -Wno-c++98-compat-pedantic -Wno-sign-conversion -Wno-padded -Wno-shorten-64-to-32 -Wno-reserved-id-macro -Wno-float-conversion -Wno-format-pedantic -Wno-shadow -Wno-conversion -Wno-zero-as-null-pointer-constant -Wno-missing-field-initializers -Wno-used-but-marked-unused -Wno-unused-macros -Wno-comma -Wno-float-equal -Wno-disabled-macro-expansion -Wno-weak-vtables -Wno-unused-parameter -Wno-covered-switch-default -Wno-unreachable-code -Wno-unused-template -DHB_WITH_WIN1256" CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-glib --with-cairo --with-icu --with-graphite2 --with-fontconfig - - run: make -j32 CPPFLAGS="-Werror" - - run: HB_TEST_SUBSET_FUZZER_TIMEOUT=30 make check CPPFLAGS="-Werror" || .ci/fail.sh - - clang-asan: - docker: - - image: ubuntu:19.10 - steps: - - checkout - - run: apt update || true; apt install -y wget gnupg - - run: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - - run: echo "deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdev.list - - run: echo "deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdevsrc.list - - run: apt update || true - - run: apt install -y clang lld binutils libtool autoconf automake make pkg-config gtk-doc-tools ragel libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip - - run: pip install fonttools - - run: CPPFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer" CFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer" CXXFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer" LD=ld.lld CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-glib --with-cairo --with-icu --with-graphite2 - - run: make -j32 - - run: HB_TEST_SUBSET_FUZZER_TIMEOUT=30 make check || .ci/fail.sh | asan_symbolize | c++filt - - clang-msan: - docker: - - image: ubuntu:19.10 - steps: - - checkout - - run: apt update || true; apt install -y wget gnupg - - run: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - - run: echo "deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdev.list - - run: echo "deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdevsrc.list - - run: apt update || true - - run: apt install -y clang lld binutils libtool autoconf automake gtk-doc-tools gettext make pkg-config ragel libcairo2-dev libicu-dev libmount-dev libgraphite2-dev python python-pip - - run: pip install fonttools - - run: update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.lld" 10 - - run: wget https://ftp.gnome.org/pub/gnome/sources/glib/2.58/glib-2.58.1.tar.xz && tar xf glib-2.58.1.tar.xz && cd glib-2.58.1 && ./autogen.sh --with-pcre CPPFLAGS="-fsanitize=memory" LDFLAGS="-fsanitize=memory" CFLAGS="-fsanitize=memory" CXXFLAGS="-fsanitize=memory" LD=ld.lld CC=clang CXX=clang++ && make -j32 && make install && cd .. - - run: wget http://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2 && tar xf freetype-2.9.tar.bz2 && cd freetype-2.9 && ./autogen.sh && ./configure CPPFLAGS="-fsanitize=memory" LDFLAGS="-fsanitize=memory -O1 -g -fno-omit-frame-pointer" CFLAGS="-fsanitize=memory -O1 -g -fno-omit-frame-pointer" CXXFLAGS="-fsanitize=memory -O1 -g -fno-omit-frame-pointer" LD=ld.lld CC=clang CXX=clang++ && make -j32 && make install && cd .. - - run: CPPFLAGS="-fsanitize=memory -fsanitize-memory-track-origins" LDFLAGS="-fsanitize=memory -fsanitize-memory-track-origins -O1 -g -fno-omit-frame-pointer" CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins -O1 -g -fno-omit-frame-pointer" CXXFLAGS="-fsanitize=memory -fsanitize-memory-track-origins -O1 -g -fno-omit-frame-pointer" LD=ld.lld CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-glib --without-icu - - run: make -j32 && MSAN_OPTIONS=exitcode=42 HB_TEST_SUBSET_FUZZER_TIMEOUT=60 make check || .ci/fail.sh | asan_symbolize | c++filt - - clang-tsan: - docker: - - image: ubuntu:19.10 - steps: - - checkout - - run: apt update || true; apt install -y wget gnupg - - run: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - - run: echo "deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdev.list - - run: echo "deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdevsrc.list - - run: apt update || true - - run: apt install -y clang lld binutils libtool autoconf automake make pkg-config ragel libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip - - run: pip install fonttools - - run: CPPFLAGS="-fsanitize=thread" LDFLAGS="-fsanitize=thread -O3" CFLAGS="-fsanitize=thread -O3" CXXFLAGS="-fsanitize=thread -O3" LD=ld.lld CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-glib --with-cairo --with-icu --with-graphite2 - - run: make -j32 - - run: HB_TEST_SUBSET_FUZZER_TIMEOUT=60 make check || .ci/fail.sh | asan_symbolize | c++filt - - clang-ubsan: - docker: - - image: ubuntu:19.10 - steps: - - checkout - - run: apt update || true; apt install -y wget gnupg - - run: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - - run: echo "deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdev.list - - run: echo "deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan main" > /etc/apt/sources.list.d/llvmdevsrc.list - - run: apt update || true - - run: apt install -y clang lld binutils libtool autoconf automake make pkg-config ragel libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip - - run: pip install fonttools - - run: CPPFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" LDFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined -O1 -g -fno-omit-frame-pointer" CFLAGS="-fsanitize=undefined -O1 -g -fno-omit-frame-pointer" CXXFLAGS="-fsanitize=undefined -O1 -g -fno-omit-frame-pointer" LD=ld.lld CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-glib --with-cairo --with-icu --with-graphite2 - - run: make -j32 - - run: UBSAN_OPTIONS=print_stacktrace=1 HB_TEST_SUBSET_FUZZER_TIMEOUT=60 make check || .ci/fail.sh | asan_symbolize | c++filt - - fedora-O0-debug-outoftreebuild: + fedora-valgrind: docker: - image: fedora steps: - checkout - - run: dnf install -y pkg-config ragel gcc gcc-c++ automake autoconf libtool make which diffutils glib2-devel freetype-devel cairo-devel libicu-devel gobject-introspection-devel graphite2-devel redhat-rpm-config python python-pip || true - - run: NOCONFIGURE=1 ./autogen.sh - - run: mkdir build && cd build && CFLAGS="-O0" CXXFLAGS="-O0" CPPFLAGS="-DHB_DEBUG" ../configure --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 && make -j32 && (HB_TEST_SUBSET_FUZZER_TIMEOUT=30 make check || ../.ci/fail.sh) + - 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 build --buildtype=debugoptimized + - run: ninja -Cbuild -j9 + # increase timeouts and remove --no-suite=slow + - run: RUN_VALGRIND=1 HB_TEST_SHAPE_FUZZER_TIMEOUT=5 HB_TEST_SUBSET_FUZZER_TIMEOUT=50 meson test -Cbuild --no-suite=slow --wrap='valgrind --leak-check=full --error-exitcode=1' --print-errorlogs + + alpine: + docker: + - image: alpine + steps: + - checkout + - run: apk update && apk add ragel meson gcc g++ glib-dev freetype-dev cairo-dev git + - run: meson build --buildtype=minsize + - run: ninja -Cbuild -j9 + - run: meson test -Cbuild --print-errorlogs + + archlinux: + docker: + - image: archlinux/base + steps: + - checkout + - run: pacman --noconfirm -Syu freetype2 meson git clang cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python python-pip base-devel gtk-doc + - run: pip install flake8 fonttools + - run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics + - run: meson build -Dgraphite=enabled -Dauto_features=enabled + - run: meson compile -Cbuild -j9 + - run: meson test -Cbuild --print-errorlogs + - run: meson dist -Cbuild + - run: clang -c src/harfbuzz.cc -DHB_NO_MT + - run: clang -c src/hb-*.cc -DHB_NO_MT -DHB_TINY -DHB_NO_OT_FONT + + sanitizers: + docker: + - image: ubuntu:20.04 + steps: + - checkout + - run: apt update || true; DEBIAN_FRONTEND=noninteractive apt install -y wget gnupg + - run: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - + - run: echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" > /etc/apt/sources.list.d/llvmdev.list + - run: echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal main" > /etc/apt/sources.list.d/llvmdevsrc.list + - run: apt update || true + - run: DEBIAN_FRONTEND=noninteractive apt install -y clang lld git binutils meson pkg-config ragel libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev + # asan+ubsan + - run: rm -rf build && meson build --default-library=static -Db_sanitize=address,undefined --buildtype=debugoptimized --wrap-mode=nodownload + - run: ninja -Cbuild -j8 && HB_TEST_SUBSET_FUZZER_TIMEOUT=30 meson test -Cbuild --print-errorlogs | asan_symbolize | c++filt + # tsan + - run: rm -rf build && meson build --default-library=static -Db_sanitize=thread --buildtype=debugoptimized --wrap-mode=nodownload + - run: ninja -Cbuild -j8 && HB_TEST_SUBSET_FUZZER_TIMEOUT=30 meson test -Cbuild --print-errorlogs | asan_symbolize | c++filt + # msan, needs --force-fallback-for=glib,freetype2 also which doesn't work yet but runs fuzzer cases at least + - run: rm -rf build && meson build --default-library=static -Db_sanitize=memory --buildtype=debugoptimized --wrap-mode=nodownload -Dauto_features=disabled -Dtests=enabled + - run: ninja -Cbuild -j8 && HB_TEST_SUBSET_FUZZER_TIMEOUT=30 meson test -Cbuild --print-errorlogs | asan_symbolize | c++filt + # test -std=c++2a and -Weverything of nightly clang builds + - run: clang -c src/harfbuzz.cc src/hb-subset*.cc -DHB_NO_MT -Werror -std=c++2a -Wno-ambiguous-reversed-operator # TOOO fix the warning + - run: clang -c src/harfbuzz.cc src/hb-subset*.cc -DHB_NO_MT -Werror -Weverything -Wno-old-style-cast -Wno-documentation -Wno-documentation-unknown-command -Wno-c++98-compat -Wno-cast-qual -Wno-c++98-compat-pedantic -Wno-sign-conversion -Wno-padded -Wno-shorten-64-to-32 -Wno-reserved-id-macro -Wno-float-conversion -Wno-format-pedantic -Wno-shadow -Wno-conversion -Wno-zero-as-null-pointer-constant -Wno-missing-field-initializers -Wno-used-but-marked-unused -Wno-unused-macros -Wno-comma -Wno-float-equal -Wno-disabled-macro-expansion -Wno-weak-vtables -Wno-unused-parameter -Wno-covered-switch-default -Wno-unreachable-code -Wno-unused-template -DHB_WITH_WIN1256 meson-gcc-mingw: docker: - - image: ubuntu:19.10 + - image: ubuntu:20.04 steps: - checkout - - run: apt update && apt install -y ninja-build binutils meson gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip git g++-mingw-w64-i686 zip + - run: apt update && DEBIAN_FRONTEND=noninteractive apt install -y ninja-build binutils meson gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip git g++-mingw-w64-i686 zip - run: pip3 install fonttools --upgrade - run: pip3 install git+https://github.com/mesonbuild/meson # use C linker, remove when meson 0.55 is released # a regular meson run @@ -229,7 +134,7 @@ jobs: # test a meson based dist - run: meson dist -Cbuild && rm -rf build # test experimental APIs - - run: meson build -Dexperimental_api=true -Dexperimental_api=true -Doptimization=2 && ninja -j9 -Cbuild test # or meson test -Cbuild + - run: meson build -Dexperimental_api=true -Doptimization=2 && ninja -j9 -Cbuild test # or meson test -Cbuild # run benchmarks - run: build/perf/perf && meson test -Cbuild --benchmark && rm -rf build # or ninja -Cbuild benchmark # mingw @@ -241,24 +146,13 @@ workflows: version: 2 build: jobs: - # macOS - macos-10.12.6-aat-fonts - macos-10.13.6-aat-fonts - macos-10.14.4-aat-fonts - macos-10.15.3-aat-fonts - - - distcheck - - # autotools based builds - - alpine-O3-Os-NOMMAP - - archlinux-py3-all - - gcc-valgrind - - clang-O3-O0-and-nobuildsystem - - clang-everything - - clang-asan - - clang-msan - - clang-tsan - - clang-ubsan - - fedora-O0-debug-outoftreebuild - + - distcheck # will be dropped with autotools removal + - fedora-valgrind + - alpine + - archlinux + - sanitizers - meson-gcc-mingw diff --git a/test/fuzzing/run-draw-fuzzer-tests.py b/test/fuzzing/run-draw-fuzzer-tests.py index de52a8da5..acae7a81d 100755 --- a/test/fuzzing/run-draw-fuzzer-tests.py +++ b/test/fuzzing/run-draw-fuzzer-tests.py @@ -36,15 +36,11 @@ please provide it as the first argument to the tool""") print ('hb_draw_fuzzer:', hb_draw_fuzzer) fails = 0 -libtool = os.getenv ('LIBTOOL') valgrind = None if os.getenv ('RUN_VALGRIND', ''): valgrind = shutil.which ('valgrind') if valgrind is None: sys.exit ("""Valgrind requested but not found.""") - if libtool is None: - print ("""Valgrind support is currently autotools only and needs libtool but not found.""") - parent_path = os.path.join (srcdir, "fonts") for file in os.listdir (parent_path): @@ -52,7 +48,7 @@ for file in os.listdir (parent_path): path = os.path.join (parent_path, file) if valgrind: - text, returncode = cmd (libtool.split(' ') + ['--mode=execute', valgrind + ' --leak-check=full --error-exitcode=1', '--', hb_draw_fuzzer, path]) + text, returncode = cmd ([valgrind, '--leak-check=full', '--error-exitcode=1', hb_draw_fuzzer, path]) else: text, returncode = cmd ([hb_draw_fuzzer, path]) if 'error' in text: diff --git a/test/fuzzing/run-shape-fuzzer-tests.py b/test/fuzzing/run-shape-fuzzer-tests.py index 7eb347fd0..348d1384f 100755 --- a/test/fuzzing/run-shape-fuzzer-tests.py +++ b/test/fuzzing/run-shape-fuzzer-tests.py @@ -36,22 +36,18 @@ please provide it as the first argument to the tool""") print ('hb_shape_fuzzer:', hb_shape_fuzzer) fails = 0 -libtool = os.getenv ('LIBTOOL') valgrind = None if os.getenv ('RUN_VALGRIND', ''): valgrind = shutil.which ('valgrind') if valgrind is None: sys.exit ("""Valgrind requested but not found.""") - if libtool is None: - print ("""Valgrind support is currently autotools only and needs libtool but not found.""") - parent_path = os.path.join (srcdir, "fonts") for file in os.listdir (parent_path): path = os.path.join (parent_path, file) if valgrind: - text, returncode = cmd (libtool.split(' ') + ['--mode=execute', valgrind + ' --leak-check=full --error-exitcode=1', '--', hb_shape_fuzzer, path]) + text, returncode = cmd ([valgrind, '--leak-check=full', '--error-exitcode=1', hb_shape_fuzzer, path]) else: text, returncode = cmd ([hb_shape_fuzzer, path]) if 'error' in text: diff --git a/test/fuzzing/run-subset-fuzzer-tests.py b/test/fuzzing/run-subset-fuzzer-tests.py index 45b7964b5..800a43601 100755 --- a/test/fuzzing/run-subset-fuzzer-tests.py +++ b/test/fuzzing/run-subset-fuzzer-tests.py @@ -36,15 +36,11 @@ please provide it as the first argument to the tool""") print ('hb_subset_fuzzer:', hb_subset_fuzzer) fails = 0 -libtool = os.getenv ('LIBTOOL') valgrind = None if os.getenv ('RUN_VALGRIND', ''): valgrind = shutil.which ('valgrind') if valgrind is None: sys.exit ("""Valgrind requested but not found.""") - if libtool is None: - print ("""Valgrind support is currently autotools only and needs libtool but not found.""") - def run_dir (parent_path): global fails @@ -55,7 +51,7 @@ def run_dir (parent_path): print ("running subset fuzzer against %s" % path) if valgrind: - text, returncode = cmd (libtool.split(' ') + ['--mode=execute', valgrind + ' --leak-check=full --show-leak-kinds=all --error-exitcode=1', '--', hb_subset_fuzzer, path]) + text, returncode = cmd ([valgrind, '--leak-check=full', '--error-exitcode=1', hb_subset_fuzzer, path]) else: text, returncode = cmd ([hb_subset_fuzzer, path]) if 'error' in text: