walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

removed unnecessary OSS-Fuzz related builds from CI (#4827)

This commit is contained in:
Oliver Stöneberg 2023-02-25 15:40:12 +01:00 committed by GitHub
parent af44659e06
commit 36192c50f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/CI-unixish.yml vendored
View File

@ -280,23 +280,6 @@ jobs:
qmake CONFIG+=debug CONFIG+=ccache qmake CONFIG+=debug CONFIG+=ccache
make -j$(nproc) make -j$(nproc)
build_fuzz:
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04] # only needs to build on ubuntu
fail-fast: false # Prefer quick result
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Build Fuzzer
run: |
pushd oss-fuzz
make -j$(nproc) CXX=clang++ CXXFLAGS="-fsanitize=address" fuzz-client translate
build: build:
strategy: strategy:

1
CMakeLists.txt
View File

@ -94,7 +94,6 @@ add_subdirectory(cli) # Client application
add_subdirectory(test) # Tests add_subdirectory(test) # Tests
add_subdirectory(gui) # Graphical application add_subdirectory(gui) # Graphical application
add_subdirectory(tools/triage) # Triage tool add_subdirectory(tools/triage) # Triage tool
add_subdirectory(oss-fuzz) # OSS-Fuzz clients
add_subdirectory(tools) add_subdirectory(tools)
include(cmake/clang_tidy.cmake) include(cmake/clang_tidy.cmake)

1
cmake/options.cmake
View File

@ -38,7 +38,6 @@ endif()
option(BUILD_TESTS "Build tests" OFF) option(BUILD_TESTS "Build tests" OFF)
option(REGISTER_TESTS "Register tests in CTest" ON) option(REGISTER_TESTS "Register tests in CTest" ON)
option(ENABLE_CHECK_INTERNAL "Enable internal checks" OFF) option(ENABLE_CHECK_INTERNAL "Enable internal checks" OFF)
option(ENABLE_OSS_FUZZ "Enable the OSS-Fuzz related targets" ON)
option(BUILD_GUI "Build the qt application" OFF) option(BUILD_GUI "Build the qt application" OFF)
option(WITH_QCHART "Enable QtCharts usage in the GUI" OFF) option(WITH_QCHART "Enable QtCharts usage in the GUI" OFF)

1
cmake/printInfo.cmake
View File

@ -45,7 +45,6 @@ if(BUILD_TESTS)
message( STATUS "REGISTER_TESTS = ${REGISTER_TESTS}" ) message( STATUS "REGISTER_TESTS = ${REGISTER_TESTS}" )
endif() endif()
message( STATUS "ENABLE_CHECK_INTERNAL = ${ENABLE_CHECK_INTERNAL}" ) message( STATUS "ENABLE_CHECK_INTERNAL = ${ENABLE_CHECK_INTERNAL}" )
message( STATUS "ENABLE_OSS_FUZZ = ${ENABLE_OSS_FUZZ}" )
message( STATUS ) message( STATUS )
message( STATUS "BUILD_GUI = ${BUILD_GUI}" ) message( STATUS "BUILD_GUI = ${BUILD_GUI}" )
if (BUILD_GUI) if (BUILD_GUI)

31
oss-fuzz/CMakeLists.txt
View File

@ -1,31 +0,0 @@
if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(fuzz-client_SRC
main.cpp
type2.cpp
)
if(USE_BUNDLED_TINYXML2)
list(APPEND fuzz-client_SRC $<TARGET_OBJECTS:tinyxml2_objs>)
endif()
add_executable(fuzz-client EXCLUDE_FROM_ALL
${fuzz-client_SRC}
$<TARGET_OBJECTS:simplecpp_objs>
$<TARGET_OBJECTS:cppcheck-core>)
target_include_directories(fuzz-client PRIVATE ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/externals/simplecpp ${CMAKE_SOURCE_DIR}/externals)
if(USE_BUNDLED_TINYXML2)
target_include_directories(fuzz-client PRIVATE ${CMAKE_SOURCE_DIR}/externals/tinyxml2/)
endif()
target_compile_options(fuzz-client PRIVATE -fsanitize=fuzzer)
# TODO: target_link_options() requires CMake >= 3.13
#target_link_options(fuzz-client PRIVATE -fsanitize=fuzzer)
target_link_libraries(fuzz-client PRIVATE -fsanitize=fuzzer)
if (HAVE_RULES)
target_link_libraries(fuzz-client PRIVATE ${PCRE_LIBRARY})
endif()
if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
target_link_libraries(fuzz-client PRIVATE ${tinyxml2_LIBRARIES})
endif()
add_executable(translate EXCLUDE_FROM_ALL
translate.cpp
type2.cpp)
endif()

7
oss-fuzz/Makefile
View File

@ -3,7 +3,7 @@
# ==================== # ====================
# #
# Local libfuzzer client: # Local libfuzzer client:
# make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client # make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" LIB_FUZZING_ENGINE="-fsanitize=fuzzer" oss-fuzz-client
CPPCHECK_DIR=.. CPPCHECK_DIR=..
INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/picojson -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml2 -I ${CPPCHECK_DIR}/externals INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/picojson -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml2 -I ${CPPCHECK_DIR}/externals
@ -14,11 +14,8 @@ all: oss-fuzz-client translate
oss-fuzz-client: main.cpp type2.cpp type2.h oss-fuzz-client: main.cpp type2.cpp type2.h
${CXX} -std=c++11 -g ${CXXFLAGS} -o oss-fuzz-client ${INCLUDE_DIR} ${SRC_FILES} ${LIB_FUZZING_ENGINE} ${CXX} -std=c++11 -g ${CXXFLAGS} -o oss-fuzz-client ${INCLUDE_DIR} ${SRC_FILES} ${LIB_FUZZING_ENGINE}
fuzz-client: main.cpp type2.cpp type2.h
${CXX} -std=c++11 -g ${CXXFLAGS} -o fuzz-client ${INCLUDE_DIR} ${SRC_FILES} -fsanitize=fuzzer
translate: translate.cpp type2.cpp type2.h translate: translate.cpp type2.cpp type2.h
${CXX} -std=c++11 -g ${CXXFLAGS} -o translate type2.cpp translate.cpp ${CXX} -std=c++11 -g ${CXXFLAGS} -o translate type2.cpp translate.cpp
clean: clean:
rm -f oss-fuzz-client fuzz-client translate rm -f oss-fuzz-client translate