Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reenable GraphicsFuzz (#3140) 

Also revert "Improve support for GraphicsFuzz (#3129)"

This reverts commit f98bd5289a.
This commit is contained in:
jonathanmetzman 2019-12-16 19:39:36 -08:00 committed by GitHub
parent fa4317bd4a
commit f6131a0cca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/graphicsfuzz-spirv/Dockerfile
View File

@ -15,20 +15,18 @@
################################################################################
FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y cmake ninja-build && apt-get install -y maven && apt-get install -y openjdk-8-jdk-headless && apt-get install -y wget
RUN apt-get update && apt-get install -y cmake ninja-build
RUN mkdir -p graphicsfuzz-spirv
RUN git clone --depth=1 https://github.com/KhronosGroup/glslang.git graphicsfuzz-spirv/glslang
RUN git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Cross.git graphicsfuzz-spirv/SPIRV-Cross
RUN git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Tools.git graphicsfuzz-spirv/SPIRV-Tools
RUN git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers graphicsfuzz-spirv/SPIRV-Tools/external/spirv-headers
RUN git clone --depth=1 https://github.com/google/effcee graphicsfuzz-spirv/SPIRV-Tools/external/effcee
RUN git clone --depth=1 https://github.com/google/re2 graphicsfuzz-spirv/SPIRV-Tools/external/re2
# Cloning with --depth=1 does not work for GraphicsFuzz due to GraphicsFuzz doing a git commit check during its build process.
RUN git clone https://github.com/google/graphicsfuzz.git graphicsfuzz-spirv/graphicsfuzz
COPY build.sh $SRC/
WORKDIR graphicsfuzz-spirv

8
projects/graphicsfuzz-spirv/build.sh
View File

@ -39,12 +39,4 @@ pushd SPIRV-Cross/build
cmake -G "Ninja" -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_C_COMPILER=$CC -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" ..
ninja
cp spirv-cross $OUT/
popd
pushd graphicsfuzz
mvn package -Dmaven.test.skip=True
cp -r graphicsfuzz/target/graphicsfuzz $OUT/
popd
wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz
tar xzf OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz -C $OUT

2
projects/graphicsfuzz-spirv/project.yaml
View File

@ -15,5 +15,3 @@ sanitizers:
architectures:
- x86_64
- i386
disabled: True