adding template for pw_fuzz_tests

Author: Alami-Amine

BUILD.gn

@@ -68,7 +68,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         #":pw_module_tests.run($dir_pigweed/targets/host:host_clang_fuzz)",
         #"$dir_pigweed:pw_module_tests.run($dir_pigweed/targets/host:host_clang_fuzz)",
         # "${chip_root}/build/toolchain/pw_fuzzer:clang_pw_fuzz",
-        "${chip_root}/src/lib/format/tests:FuzzPayloadDecoderPW(//build/toolchain/pw_fuzzer:clang_pw_fuzz)",
+        "${chip_root}/src/lib/format/tests:FuzzPayloadDecoderPW(//build/toolchain/pw_fuzzer:chip_pw_fuzztest)",
       ]
     }
   }

build/chip/fuzz_test.gni

@@ -14,8 +14,11 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
+import("//build_overrides/pigweed.gni")
+
 import("${build_root}/config/compiler/compiler.gni")
 import("${chip_root}/build/chip/tests.gni")
+import("${dir_pw_unit_test}/test.gni")
 
 declare_args() {
   enable_fuzz_test_targets = is_clang && chip_build_tests &&
@@ -68,3 +71,54 @@ template("chip_fuzz_target") {
     }
   }
 }
+
+template("chip_pw_fuzz_target") {
+  not_needed([ "target_name" ])
+  if (!defined(invoker.sources)) {
+    sources = []
+  }
+  if (!defined(invoker.public_deps)) {
+    public_deps = []
+  }
+  if (!defined(invoker.deps)) {
+    deps = []
+  }
+
+  if (defined(invoker.test_sources)) {
+    foreach(_test, invoker.test_sources) {
+      _test_name = string_replace(_test, ".cpp", "")
+
+      _test_output_dir = "${root_out_dir}/fuzz_tests"
+      if (defined(invoker.output_dir)) {
+        _test_output_dir = invoker.output_dir
+      }
+
+      pw_test(_test_name) {
+        forward_variables_from(invoker,
+                               [
+                                 "deps",
+                                 "public_deps",
+                                 "cflags",
+                                 "configs",
+                               ])
+
+        # TODO see what to do with this, I added it to try running FuzzTest with compatibility mode, since this is the mode supported by OSS-fuzz
+        # defines = [
+        #   "FUZZTEST_COMPATIBILITY_MODE=libfuzzer",
+        #   "MAKE_BUILD_TYPE=RelWithDebug",
+        # ]
+
+        #cflags = [ "-Wno-error=format-nonliteral" ] CAN NOT USE since strict_warning defines the opposite
+
+        sources = [ _test ]
+        output_dir = _test_output_dir
+
+        deps += [ "$dir_pw_fuzzer:fuzztest" ]
+
+        # this is necessary so it is not disable in third_party/pigweed/repo/pw_unit_test/test.gni
+        # otherwise it will be built successfully but with FuzzPayloadDecoderPW.DISABLED.ninja and no executable
+        enable_if = true
+      }
+    }
+  }
+}

build/config/compiler/BUILD.gn

@@ -239,7 +239,9 @@ config("strict_warnings") {
     "-Wunreachable-code",
     "-Wvla",
     "-Wformat",
-    "-Wformat-nonliteral",
+
+    #TODO: Remove this workaround to build FuzzTests; Abseil C++ submodule is has an error related to this warning
+    #"-Wformat-nonliteral",
     "-Wformat-security",
   ]
 
@@ -308,8 +310,7 @@ config("strict_warnings") {
 config("warnings_default") {
   configs = [
     ":warnings_common",
-
-    #  ":strict_warnings",
+    ":strict_warnings",
     ":disabled_warnings",
   ]
 }
@@ -369,18 +370,11 @@ config("runtime_default") {
   }
   if (current_os == "linux" || current_os == "tizen" || current_os == "webos") {
     libs = [
+      "atomic",
       "dl",
       "pthread",
       "rt",
     ]
-
-    #TODO: see what to do with this workaround
-    # work around because when building pw_fuzzer, the downstreamed pw_fuzzer toolchain makes us use --sysroot flag in the clang++ invocation; the sysroot flag points to the "clang_sysroot" subdirectory of the CIPD environemnt,
-    # the clang_sysroot folder is populated from CIPD  (fuchsia/third_party/sysroot/linux) which does not include the libatomic library and makes the FuzzTest linking fail
-    # FYI, using the sysroot flag is only activated when pw_toolchain_OSS_FUZZ_ENABLED=false
-    if (is_pw_fuzz == false) {
-      libs += [ "atomic" ]
-    }
   }
 
   cflags = []

build/toolchain/pw_fuzzer/BUILD.gn

@@ -22,10 +22,10 @@ import("$dir_pigweed/targets/host/target_toolchains.gni")
 
 #import("$dir_pigweed/pw_toolchain/host_clang/toolchains.gni")
 
-gcc_toolchain("clang_pw_fuzz") {
+gcc_toolchain("chip_pw_fuzztest") {
   toolchain_args = {
-    name = "clang_pw_fuzz"
-    print("gcc_toolchain(clang_pw_fuzz)")
+    name = "chip_pw_fuzztest"
+    print("gcc_toolchain(chip_pw_fuzztest)")
 
     #  print("pw_toolchain_host_clang = $pw_toolchain_host_clang")
     # forward_variables_from(pw_toolchain_host_clang.fuzz, "*", [ "name" ])
@@ -37,7 +37,8 @@ gcc_toolchain("clang_pw_fuzz") {
     #This is needed to have the defaults passed from pw_target_toolchain_host.clang_fuzz,
     forward_variables_from(defaults, "*")
 
-    #print("defaults = $defaults")
+    print("defaults = $defaults")
+
     print("pw_toolchain_FUZZING_ENABLED  = ${pw_toolchain_FUZZING_ENABLED}")
     pw_unit_test_MAIN = "$dir_pw_fuzzer:fuzztest_main"
     pw_unit_test_BACKEND = "$dir_pw_fuzzer:gtest"

src/lib/format/tests/BUILD.gn

@@ -58,20 +58,41 @@ if (enable_fuzz_test_targets) {
   }
 }
 
-if (pw_enable_fuzz_test_targets) {
-  # DOCSTAG: [pwfuzzer_examples_fuzztest-gn]
-  pw_test("FuzzPayloadDecoderPW") {
-    sources = [ "FuzzPayloadDecoderPW.cpp" ]
+# if (pw_enable_fuzz_test_targets) {
+#   # DOCSTAG: [pwfuzzer_examples_fuzztest-gn]
+#   pw_test("FuzzPayloadDecoderPW") {
+#     sources = [ "FuzzPayloadDecoderPW.cpp" ]
 
-    # print(" aAAAA: $dir_pw_fuzzer")
-    deps = [
-      #":pw_module_tests.run($dir_pigweed/targets/host:host_clang_fuzz)",
-      "$dir_pw_fuzzer:fuzztest",  # <- Added!
+#     # print(" aAAAA: $dir_pw_fuzzer")
+#     deps = [
+#       #":pw_module_tests.run($dir_pigweed/targets/host:host_clang_fuzz)",
+#       "$dir_pw_fuzzer:fuzztest",  # <- Added!
 
-      #  "${chip_root}/build/toolchain/pw_fuzzer:clang_pw_fuzz",
+#       #  "${chip_root}/build/toolchain/pw_fuzzer:clang_pw_fuzz",
+
+#       # "${chip_root}:fuzzers",
+#     ]
+#     public_deps = [
+#       "${chip_root}/src/controller/data_model:cluster-tlv-metadata",
+#       "${chip_root}/src/lib/core",
+#       "${chip_root}/src/lib/format:flat-tree",
+#       "${chip_root}/src/lib/format:protocol-decoder",
+#       "${chip_root}/src/lib/format:protocol-tlv-metadata",
+#       "${chip_root}/src/lib/support",
+#       "${chip_root}/src/platform/logging:stdio",
+#     ]
+
+#     # this is necessary so it is not disable in third_party/pigweed/repo/pw_unit_test/test.gni
+#     # otherwise it will be built successfully but with FuzzPayloadDecoderPW.DISABLED.ninja and no executable
+
+#     enable_if = true
+#   }
+# }
+
+if (pw_enable_fuzz_test_targets) {
+  chip_pw_fuzz_target("FuzzPayloadDecoder") {
+    test_sources = [ "FuzzPayloadDecoderPW.cpp" ]
 
-      # "${chip_root}:fuzzers",
-    ]
     public_deps = [
       "${chip_root}/src/controller/data_model:cluster-tlv-metadata",
       "${chip_root}/src/lib/core",
@@ -81,10 +102,5 @@ if (pw_enable_fuzz_test_targets) {
       "${chip_root}/src/lib/support",
       "${chip_root}/src/platform/logging:stdio",
     ]
-
-    # this is necessary so it is not disable in third_party/pigweed/repo/pw_unit_test/test.gni
-    # otherwise it will be built successfully but with FuzzPayloadDecoderPW.DISABLED.ninja and no executable
-
-    enable_if = true
   }
 }