From 5415fe155d07d7ad27fa3c8e64331df2e737992a Mon Sep 17 00:00:00 2001 From: werdnaH <32367543+werdnaH@users.noreply.github.com> Date: Sat, 1 Aug 2020 02:41:31 +0000 Subject: [PATCH] [Skia] Update SKP Fuzzer (#4245) * Update SKP Fuzzer * fixed cf_map Co-authored-by: Zepeng Hu --- projects/skia/BUILD.gn.diff | 13 +++++++++++++ projects/skia/Dockerfile | 2 ++ projects/skia/build.sh | 6 +++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/projects/skia/BUILD.gn.diff b/projects/skia/BUILD.gn.diff index 5278dad16..cb9f96117 100644 --- a/projects/skia/BUILD.gn.diff +++ b/projects/skia/BUILD.gn.diff @@ -521,4 +521,17 @@ test_app("skruntimeeffect") { ":gpu_tool_utils", ":skia", ] +} + +test_app("skp") { + sources = [ + "fuzz/Fuzz.cpp", + "fuzz/FuzzCommon.cpp", + "fuzz/oss_fuzz/FuzzSKP.cpp", + ] + deps = [ + ":gpu_tool_utils", + ":flags", + ":skia", + ] } \ No newline at end of file diff --git a/projects/skia/Dockerfile b/projects/skia/Dockerfile index de982176e..b68fc19a9 100644 --- a/projects/skia/Dockerfile +++ b/projects/skia/Dockerfile @@ -74,6 +74,8 @@ RUN wget -O $SRC/skia/svg_dom_seed_corpus.zip https://storage.googleapis.com/ski RUN wget -O $SRC/skia/sksl_with_256_padding_seed_corpus.zip https://storage.googleapis.com/skia-fuzzer/oss-fuzz/sksl_with_256_padding_seed_corpus.zip +RUN wget -O $SRC/skia/skp_seed_corpus.zip https://storage.googleapis.com/skia-fuzzer/oss-fuzz/skp_seed_corpus.zip + COPY build.sh $SRC/ COPY skia.diff $SRC/skia/skia.diff diff --git a/projects/skia/build.sh b/projects/skia/build.sh index 54f479e93..ce0e0a015 100644 --- a/projects/skia/build.sh +++ b/projects/skia/build.sh @@ -109,7 +109,8 @@ $SRC/depot_tools/ninja -C out/Fuzz region_deserialize region_set_path \ api_polyutils android_codec image_decode_incremental \ sksl2glsl sksl2spirv sksl2metal sksl2pipeline \ skdescriptor_deserialize\ - svg_dom api_svg_canvas skruntimeeffect api_create_ddl + svg_dom api_svg_canvas skruntimeeffect api_create_ddl \ + skp $SRC/depot_tools/ninja -C out/Fuzz_mem_constraints image_filter_deserialize \ api_raster_n32_canvas \ @@ -222,3 +223,6 @@ cp out/Fuzz/skruntimeeffect $OUT/skruntimeeffect cp ./sksl_with_256_padding_seed_corpus.zip $OUT/skruntimeeffect_seed_corpus.zip cp out/Fuzz/api_create_ddl $OUT/api_create_ddl + +cp out/Fuzz/skp $OUT/skp +cp ./skp_seed_corpus.zip $OUT/skp_seed_corpus.zip \ No newline at end of file