factor out main into a separate file

pauldreik · Jun 14, 2019 · 35f84c8 · 35f84c8
1 parent a23b7a1
commit 35f84c8
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 101 deletions.
diff --git a/test/fuzzing/CMakeLists.txt b/test/fuzzing/CMakeLists.txt
@@ -20,13 +20,13 @@ two_args.cpp
 )
 
 if(FMT_FUZZ_LINKMAIN)
-  add_definitions(-DIMPLEMENT_MAIN=1)
+  add_definitions(-DFMT_FUZZ_IMPLEMENT_MAIN=1)
 endif()
 
 macro(implement_fuzzer sourcefile)
   get_filename_component(basename ${sourcefile} NAME_WE)
   set(name fuzzer_${basename})
-  add_executable(${name} ${sourcefile} fuzzer_common.h)
+  add_executable(${name} ${sourcefile} fuzzer_common.h main.cpp)
   target_link_libraries(${name}  PRIVATE fmt)
 if(FMT_FUZZ_LDFLAGS)
   target_link_libraries(${name} PRIVATE ${FMT_FUZZ_LDFLAGS})

diff --git a/test/fuzzing/chrono_duration.cpp b/test/fuzzing/chrono_duration.cpp
@@ -156,23 +156,3 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, std::size_t Size) {
 
   return 0;
 }
-
-#ifdef IMPLEMENT_MAIN
-#  include <cassert>
-#  include <fstream>
-#  include <sstream>
-#  include <vector>
-int main(int argc, char* argv[]) {
-  for (int i = 1; i < argc; ++i) {
-    std::ifstream in(argv[i]);
-    assert(in);
-    in.seekg(0, std::ios_base::end);
-    const auto pos = in.tellg();
-    in.seekg(0, std::ios_base::beg);
-    std::vector<char> buf(pos);
-    in.read(buf.data(), buf.size());
-    assert(in.gcount() == pos);
-    LLVMFuzzerTestOneInput((const uint8_t*)buf.data(), buf.size());
-  }
-}
-#endif
diff --git a/test/fuzzing/fuzzer_common.h b/test/fuzzing/fuzzer_common.h
@@ -34,4 +34,7 @@ namespace fmt_fuzzer {
 }
 #endif
 
+
+
+
 #endif // FUZZER_COMMON_H
diff --git a/test/fuzzing/main.cpp b/test/fuzzing/main.cpp
@@ -0,0 +1,21 @@
+// if an int main() is needed.
+#if FMT_FUZZ_IMPLEMENT_MAIN
+#  include <cassert>
+#  include <fstream>
+#  include <sstream>
+#  include <vector>
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, std::size_t Size);
+int main(int argc, char* argv[]) {
+  for (int i = 1; i < argc; ++i) {
+    std::ifstream in(argv[i]);
+    assert(in);
+    in.seekg(0, std::ios_base::end);
+    const auto pos = in.tellg();
+    in.seekg(0, std::ios_base::beg);
+    std::vector<char> buf(pos);
+    in.read(buf.data(), buf.size());
+    assert(in.gcount() == pos);
+    LLVMFuzzerTestOneInput((const uint8_t*)buf.data(), buf.size());
+  }
+}
+#endif
diff --git a/test/fuzzing/named_arg.cpp b/test/fuzzing/named_arg.cpp
@@ -124,22 +124,3 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, std::size_t Size) {
   return 0;
 }
 
-#ifdef IMPLEMENT_MAIN
-#  include <cassert>
-#  include <fstream>
-#  include <sstream>
-#  include <vector>
-int main(int argc, char* argv[]) {
-  for (int i = 1; i < argc; ++i) {
-    std::ifstream in(argv[i]);
-    assert(in);
-    in.seekg(0, std::ios_base::end);
-    const auto pos = in.tellg();
-    in.seekg(0, std::ios_base::beg);
-    std::vector<char> buf(pos);
-    in.read(buf.data(), buf.size());
-    assert(in.gcount() == pos);
-    LLVMFuzzerTestOneInput((const uint8_t*)buf.data(), buf.size());
-  }
-}
-#endif
diff --git a/test/fuzzing/one_arg.cpp b/test/fuzzing/one_arg.cpp
@@ -131,23 +131,3 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, std::size_t Size) {
   }
   return 0;
 }
-
-#ifdef IMPLEMENT_MAIN
-#  include <cassert>
-#  include <fstream>
-#  include <sstream>
-#  include <vector>
-int main(int argc, char* argv[]) {
-  for (int i = 1; i < argc; ++i) {
-    std::ifstream in(argv[i]);
-    assert(in);
-    in.seekg(0, std::ios_base::end);
-    const auto pos = in.tellg();
-    in.seekg(0, std::ios_base::beg);
-    std::vector<char> buf(pos);
-    in.read(buf.data(), buf.size());
-    assert(in.gcount() == pos);
-    LLVMFuzzerTestOneInput((const uint8_t*)buf.data(), buf.size());
-  }
-}
-#endif
diff --git a/test/fuzzing/sprintf.cpp b/test/fuzzing/sprintf.cpp
@@ -125,23 +125,3 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, std::size_t Size) {
   }
   return 0;
 }
-
-#ifdef IMPLEMENT_MAIN
-#  include <cassert>
-#  include <fstream>
-#  include <sstream>
-#  include <vector>
-int main(int argc, char* argv[]) {
-  for (int i = 1; i < argc; ++i) {
-    std::ifstream in(argv[i]);
-    assert(in);
-    in.seekg(0, std::ios_base::end);
-    const auto pos = in.tellg();
-    in.seekg(0, std::ios_base::beg);
-    std::vector<char> buf(pos);
-    in.read(buf.data(), buf.size());
-    assert(in.gcount() == pos);
-    LLVMFuzzerTestOneInput((const uint8_t*)buf.data(), buf.size());
-  }
-}
-#endif
diff --git a/test/fuzzing/two_args.cpp b/test/fuzzing/two_args.cpp
@@ -120,23 +120,3 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, std::size_t Size) {
   }
   return 0;
 }
-
-#ifdef IMPLEMENT_MAIN
-#  include <cassert>
-#  include <fstream>
-#  include <sstream>
-#  include <vector>
-int main(int argc, char* argv[]) {
-  for (int i = 1; i < argc; ++i) {
-    std::ifstream in(argv[i]);
-    assert(in);
-    in.seekg(0, std::ios_base::end);
-    const auto pos = in.tellg();
-    in.seekg(0, std::ios_base::beg);
-    std::vector<char> buf(pos);
-    in.read(buf.data(), buf.size());
-    assert(in.gcount() == pos);
-    LLVMFuzzerTestOneInput((const uint8_t*)buf.data(), buf.size());
-  }
-}
-#endif