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

[osquery] Improve harnesses by adding build cleanup logic (#2959) 

Coverage tests are currently failing. This is most likely due to
exhausting the container disk space. This commit removes downloaded
files and build artifacts, which are not needed for coverage tests.
This commit is contained in:
Teddy Reed 2019-10-17 23:18:40 -04:00 committed by Max Moroz
parent 802224497d
commit b54b098f1d
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
projects/osquery/Dockerfile
View File

@ -27,15 +27,19 @@ RUN export GIT_VER=2.21.0 \
&& cd git-$GIT_VER/ \ && cd git-$GIT_VER/ \
&& make configure \ && make configure \
&& ./configure --with-openssl \ && ./configure --with-openssl \
&& make -j4 install && make -j4 install \
&& cd .. \
&& rm -rf v$GIT_VER.tar.gz git-$GIT_VER
# Installer newer cmake # Installer newer cmake
RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.14.6/cmake-3.14.6-Linux-x86_64.tar.gz RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.14.6/cmake-3.14.6-Linux-x86_64.tar.gz \
RUN tar xf cmake-3.14.6-Linux-x86_64.tar.gz -C /usr/local --strip 1 && tar xf cmake-3.14.6-Linux-x86_64.tar.gz -C /usr/local --strip 1 \
&& rm cmake-3.14.6-Linux-x86_64.tar.gz
# Install build toolchain # Install build toolchain
RUN wget https://github.com/osquery/osquery-toolchain/releases/download/1.0.0/osquery-toolchain-1.0.0.tar.xz RUN wget https://github.com/osquery/osquery-toolchain/releases/download/1.0.0/osquery-toolchain-1.0.0.tar.xz \
RUN tar xf osquery-toolchain-1.0.0.tar.xz -C /usr/local && tar xf osquery-toolchain-1.0.0.tar.xz -C /usr/local \
&& rm osquery-toolchain-1.0.0.tar.xz
RUN git clone --depth 1 https://github.com/osquery/osquery osquery RUN git clone --depth 1 https://github.com/osquery/osquery osquery

9
projects/osquery/build.sh
View File

@ -38,5 +38,14 @@ cmake \
cmake \ cmake \
-DCMAKE_EXE_LINKER_FLAGS=${LIB_FUZZING_ENGINE} \ -DCMAKE_EXE_LINKER_FLAGS=${LIB_FUZZING_ENGINE} \
.. ..
# Build harnesses
cmake --build . -j$(nproc) --target osqueryfuzz-config cmake --build . -j$(nproc) --target osqueryfuzz-config
# Cleanup
find . -type f -name '*.o' -delete
rm -rf "${SRC}/${PROJECT}/libraries/cmake/source/libudev/src/test"
rm -rf libs/src/patched-source/libudev/src/test
# Move harnesses to output path
cp osquery/main/osqueryfuzz-config "${OUT}/osqueryfuzz-config" cp osquery/main/osqueryfuzz-config "${OUT}/osqueryfuzz-config"