From 3163e9fedb1029439f381c1192f0e057870437ea Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Sun, 12 Jul 2020 23:11:45 +0430 Subject: [PATCH] [ci] Remove HB_TEST_SUBSET_FUZZER_TIMEOUT meson is passing it itself Fortunately oss-fuzz has its own timeout value, I just like to be conservative here and not involve outsiders with flakiness of tests specially as meson which runs them concurrently so consuming more time is expected on meson. --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index beb6e945d..f09ad855d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -69,8 +69,8 @@ jobs: - 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 + # 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 alpine: docker: @@ -110,13 +110,13 @@ jobs: - 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 + - run: ninja -Cbuild -j8 && 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 + - run: ninja -Cbuild -j8 && 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 + - run: ninja -Cbuild -j8 && 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 - run: clang -c src/hb-*.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