From 27d42198d3cdd44918854539e7111d551eb9f995 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Tue, 3 Apr 2018 12:30:32 -0400 Subject: Move oss-fuzz to MockGPUCanvas Bug: skia:7776 Change-Id: I4f2791375d8be05486d10ce8f7f2e58aa032cfd8 Reviewed-on: https://skia-review.googlesource.com/118166 Commit-Queue: Kevin Lubick Reviewed-by: Brian Salomon Reviewed-by: Mike Klein Reviewed-by: Jonathan Metzman --- fuzz/FuzzCanvas.cpp | 6 ++++-- fuzz/oss_fuzz/FuzzMockGPUCanvas.cpp | 25 +++++++++++++++++++++++++ fuzz/oss_fuzz/FuzzNullGLCanvas.cpp | 25 ------------------------- 3 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 fuzz/oss_fuzz/FuzzMockGPUCanvas.cpp delete mode 100644 fuzz/oss_fuzz/FuzzNullGLCanvas.cpp (limited to 'fuzz') diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 879f9a4862..3aca908cd0 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -1813,19 +1813,21 @@ DEF_FUZZ(NativeGLCanvas, fuzz) { fuzz_ganesh(fuzz, context); } +// This target is deprecated, NullGLContext is not well maintained. +// Please use MockGPUCanvas instead. DEF_FUZZ(NullGLCanvas, fuzz) { sk_gpu_test::GrContextFactory f; fuzz_ganesh(fuzz, f.get(sk_gpu_test::GrContextFactory::kNullGL_ContextType)); } // This target is deprecated, DebugGLContext is not well maintained. -// Please use MockGLCanvas instead. +// Please use MockGPUCanvas instead. DEF_FUZZ(DebugGLCanvas, fuzz) { sk_gpu_test::GrContextFactory f; fuzz_ganesh(fuzz, f.get(sk_gpu_test::GrContextFactory::kDebugGL_ContextType)); } -DEF_FUZZ(MockGLCanvas, fuzz) { +DEF_FUZZ(MockGPUCanvas, fuzz) { sk_gpu_test::GrContextFactory f; fuzz_ganesh(fuzz, f.get(sk_gpu_test::GrContextFactory::kMock_ContextType)); } diff --git a/fuzz/oss_fuzz/FuzzMockGPUCanvas.cpp b/fuzz/oss_fuzz/FuzzMockGPUCanvas.cpp new file mode 100644 index 0000000000..539e989f56 --- /dev/null +++ b/fuzz/oss_fuzz/FuzzMockGPUCanvas.cpp @@ -0,0 +1,25 @@ +/* + * Copyright 2018 Google, LLC + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "../Fuzz.h" + +void fuzz_MockGPUCanvas(Fuzz* f); + +extern "C" { + + // Set default LSAN options. + const char *__lsan_default_options() { + // Don't print the list of LSAN suppressions on every execution. + return "print_suppressions=0"; + } + + int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + auto fuzz = Fuzz(SkData::MakeWithoutCopy(data, size)); + fuzz_MockGPUCanvas(&fuzz); + return 0; + } +} // extern "C" diff --git a/fuzz/oss_fuzz/FuzzNullGLCanvas.cpp b/fuzz/oss_fuzz/FuzzNullGLCanvas.cpp deleted file mode 100644 index 0d562464e5..0000000000 --- a/fuzz/oss_fuzz/FuzzNullGLCanvas.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2018 Google, LLC - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "../Fuzz.h" - -void fuzz_NullGLCanvas(Fuzz* f); - -extern "C" { - - // Set default LSAN options. - const char *__lsan_default_options() { - // Don't print the list of LSAN suppressions on every execution. - return "print_suppressions=0"; - } - - int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - auto fuzz = Fuzz(SkData::MakeWithoutCopy(data, size)); - fuzz_NullGLCanvas(&fuzz); - return 0; - } -} // extern "C" -- cgit v1.2.3