From d612bb9dc8f846d5a1e687408212d6940e5633de Mon Sep 17 00:00:00 2001
From: John Stiles <71952488+johnstiles-google@users.noreply.github.com>
Date: Sat, 12 Feb 2022 10:16:20 -0500
Subject: [PATCH] Standardize SkSL corpus across all fuzzers. (#7266)

---
 projects/skia/Dockerfile |  2 --
 projects/skia/build.sh   | 13 ++++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/projects/skia/Dockerfile b/projects/skia/Dockerfile
index 39acc6205..ccb88d253 100644
--- a/projects/skia/Dockerfile
+++ b/projects/skia/Dockerfile
@@ -68,8 +68,6 @@ RUN wget -O $SRC/skia_data/sksl_seed_corpus.zip https://storage.googleapis.com/s
 
 RUN wget -O $SRC/skia_data/svg_dom_seed_corpus.zip https://storage.googleapis.com/skia-fuzzer/oss-fuzz/svg_seed_corpus.zip
 
-RUN wget -O $SRC/skia_data/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_data/skp_seed_corpus.zip https://storage.googleapis.com/skia-fuzzer/oss-fuzz/skp_seed_corpus.zip
 
 COPY image_filter_deserialize_width.options $SRC/skia_data/image_filter_deserialize_width.options
diff --git a/projects/skia/build.sh b/projects/skia/build.sh
index ed18d1fd5..52ed41d60 100644
--- a/projects/skia/build.sh
+++ b/projects/skia/build.sh
@@ -245,7 +245,7 @@ cp ../skia_data/image_decode_seed_corpus.zip $OUT/android_codec_seed_corpus.zip.
 mv out/Fuzz/image_decode_incremental $OUT/image_decode_incremental
 mv ../skia_data/image_decode_seed_corpus.zip $OUT/image_decode_incremental_seed_corpus.zip
 
-# These four SkSL tests use the same sksl_seed_corpus, and every SkSL test shares a dictionary.
+# All five SkSL tests share the same sksl_seed_corpus and dictionary.
 mv out/FuzzDebug/sksl2glsl $OUT/sksl2glsl
 cp ../skia_data/sksl.dict $OUT/sksl2glsl.dict
 cp ../skia_data/sksl_seed_corpus.zip $OUT/sksl2glsl_seed_corpus.zip
@@ -260,18 +260,17 @@ cp ../skia_data/sksl_seed_corpus.zip $OUT/sksl2metal_seed_corpus.zip
 
 mv out/FuzzDebug/sksl2pipeline $OUT/sksl2pipeline
 cp ../skia_data/sksl.dict $OUT/sksl2pipeline.dict
-mv ../skia_data/sksl_seed_corpus.zip $OUT/sksl2pipeline_seed_corpus.zip
+cp ../skia_data/sksl_seed_corpus.zip $OUT/sksl2pipeline_seed_corpus.zip
+
+mv out/FuzzDebug/skruntimeeffect $OUT/skruntimeeffect
+mv ../skia_data/sksl.dict $OUT/skruntimeeffect.dict
+mv ../skia_data/sksl_seed_corpus.zip $OUT/skruntimeeffect_seed_corpus.zip
 
 mv out/Fuzz/skdescriptor_deserialize $OUT/skdescriptor_deserialize
 
 mv out/Fuzz/svg_dom $OUT/svg_dom
 mv ../skia_data/svg_dom_seed_corpus.zip $OUT/svg_dom_seed_corpus.zip
 
-
-mv out/FuzzDebug/skruntimeeffect $OUT/skruntimeeffect
-mv ../skia_data/sksl.dict $OUT/skruntimeeffect.dict
-mv ../skia_data/sksl_with_256_padding_seed_corpus.zip $OUT/skruntimeeffect_seed_corpus.zip
-
 mv out/Fuzz/api_create_ddl $OUT/api_create_ddl
 
 mv out/Fuzz/api_ddl_threading $OUT/api_ddl_threading