From 248df5cf6520aabf50883b1a6cffadc888da28bd Mon Sep 17 00:00:00 2001 From: Alex Hultman Date: Fri, 21 Jun 2019 13:43:02 +0200 Subject: [PATCH] Clean up fuzzing Makefile --- fuzzing/Makefile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/fuzzing/Makefile b/fuzzing/Makefile index b1afd09..0c17ebf 100644 --- a/fuzzing/Makefile +++ b/fuzzing/Makefile @@ -1,14 +1,9 @@ -default: -# Fuzzing is only available with clang++ - clang -DLIBUS_NO_SSL -c -O3 uSocketsMock.c - clang++ -DUWS_NO_ZLIB -DLIBUS_NO_SSL -std=c++17 -fsanitize=address,fuzzer -O3 -I../src -I../uSockets/src uSocketsMock.o MockedHelloWorld.cpp -o MockedHelloWorld - clang++ -DUWS_NO_ZLIB -DLIBUS_NO_SSL -std=c++17 -fsanitize=address,fuzzer -O3 -I../src -I../uSockets/src uSocketsMock.o MockedEchoServer.cpp -o MockedEchoServer -# Purely "unit tests" - clang++ -std=c++17 -fsanitize=address,fuzzer -O3 WebSocket.cpp -o WebSocket - clang++ -std=c++17 -fsanitize=address,fuzzer -O3 Http.cpp -o Http - clang++ -std=c++17 -fsanitize=address,fuzzer -O3 Extensions.cpp -o Extensions - clang++ -std=c++17 -fsanitize=address,fuzzer -O3 Handshake.cpp -o Handshake - clang++ -std=c++17 -fsanitize=address,fuzzer -O3 PerMessageDeflate.cpp -o PerMessageDeflate -lz +# You can select which sanitizer to use by setting this +SANITIZER ?= address +# These are set by OSS-Fuzz, we default to AddressSanitizer +CXXFLAGS ?= -DLIBUS_NO_SSL -fsanitize=$(SANITIZER),fuzzer +CFLAGS ?= -DLIBUS_NO_SSL +OUT ?= . oss-fuzz: # "Unit tests" @@ -20,6 +15,7 @@ oss-fuzz: $(CXX) $(CXXFLAGS) -std=c++17 -O3 -DLIBUS_NO_SSL -I../src -I../uSockets/src MockedHelloWorld.cpp uSocketsMock.o -lz -o $(OUT)/MockedHelloWorld $(LIB_FUZZING_ENGINE) $(CXX) $(CXXFLAGS) -std=c++17 -O3 -DLIBUS_NO_SSL -I../src -I../uSockets/src MockedEchoServer.cpp uSocketsMock.o -lz -o $(OUT)/MockedEchoServer $(LIB_FUZZING_ENGINE) +broken: # Too small tests, failing coverage test - # $(CXX) $(CXXFLAGS) -std=c++17 -O3 Extensions.cpp -o $(OUT)/Extensions $(LIB_FUZZING_ENGINE) - # $(CXX) $(CXXFLAGS) -std=c++17 -O3 Handshake.cpp -o $(OUT)/Handshake $(LIB_FUZZING_ENGINE) + $(CXX) $(CXXFLAGS) -std=c++17 -O3 Extensions.cpp -o $(OUT)/Extensions $(LIB_FUZZING_ENGINE) + $(CXX) $(CXXFLAGS) -std=c++17 -O3 Handshake.cpp -o $(OUT)/Handshake $(LIB_FUZZING_ENGINE)