[oss-fuzz] Enable msan for fuzz tests (yhirose#734)

omjego · web-flow · commit e1f781a21a24 · 2020-11-04T11:30:56.000-05:00
* Disable openssl as we're not using it in fuzz tests

* Increase timeout in ClientStop test
diff --git a/test/fuzzing/Makefile b/test/fuzzing/Makefile
@@ -19,7 +19,8 @@ all : server_fuzzer
 
 # Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
 server_fuzzer : server_fuzzer.cc ../../httplib.h
-	$(CXX) $(CXXFLAGS) -o $@  $<  -Wl,-Bstatic $(OPENSSL_SUPPORT)  -Wl,-Bdynamic -ldl  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
+# 	$(CXX) $(CXXFLAGS) -o $@  $<  -Wl,-Bstatic $(OPENSSL_SUPPORT)  -Wl,-Bdynamic -ldl  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
+	$(CXX) $(CXXFLAGS) -o $@  $<  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
 	zip -q -r server_fuzzer_seed_corpus.zip corpus
 
 clean:
diff --git a/test/test.cc b/test/test.cc
@@ -1974,8 +1974,7 @@ TEST_F(ServerTest, ClientStop) {
     }));
   }
 
-  std::this_thread::sleep_for(std::chrono::seconds(1));
-
+  std::this_thread::sleep_for(std::chrono::seconds(2));
   while (cli_.is_socket_open()) {
     cli_.stop();
     std::this_thread::sleep_for(std::chrono::milliseconds(10));

Original file line number	Diff line number	Diff line change
`@@ -1974,8 +1974,7 @@ TEST_F(ServerTest, ClientStop) {`
`1974`	`1974`	`}));`
`1975`	`1975`	`}`
`1976`	`1976`
`1977`		`- std::this_thread::sleep_for(std::chrono::seconds(1));`
`1978`		`-`
	`1977`	`+ std::this_thread::sleep_for(std::chrono::seconds(2));`
`1979`	`1978`	`while (cli_.is_socket_open()) {`
`1980`	`1979`	`cli_.stop();`
`1981`	`1980`	`std::this_thread::sleep_for(std::chrono::milliseconds(10));`