diff --git a/BUILD.gn b/BUILD.gn
index 7a00f3610d603f6fc8d0156a6d2a75cbb42d1f84..52655fbdd7c7c66ef18ddb86713cdd99bd63a7c6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -45,17 +45,15 @@ group("ark_js_packages") {
 }
 
 group("ap_viewer_all_host_tools_packages") {
-  if (host_os != "mac" && target_os != "android") {
-    deps = [
-      "tools/ap_file_viewer/native:apViewer($build_root/toolchain/mingw:mingw_x86_64)",
-      "tools/ap_file_viewer/native:apViewer(${host_toolchain})",
-    ]
+  deps = [ "tools/ap_file_viewer/native:apViewer(${host_toolchain})" ]
+  if (is_mingw) {
+    deps += [ "tools/ap_file_viewer/native:apViewer($build_root/toolchain/mingw:mingw_x86_64)" ]
   }
 }
 
 group("ark_js_host_windows_tools_packages") {
   deps = []
-  if (host_os != "mac" && target_os != "android") {
+  if (is_mingw) {
     deps += [
       "ecmascript/compiler:ark_aot_compiler($build_root/toolchain/mingw:mingw_x86_64)",
       "ecmascript/js_vm:ark_js_vm($build_root/toolchain/mingw:mingw_x86_64)",
@@ -165,10 +163,10 @@ group("common_components_js_unittest") {
 
       #"common_components/heap/collector/tests:unittest",
       "common_components/heap/w_collector/tests:unittest",
+      "common_components/log/tests:unittest",
       "common_components/mutator/tests:unittest",
       "common_components/objects/tests:unittest",
       "common_components/thread/tests:unittest",
-      "common_components/log/tests:unittest",
     ]
   }
 }
@@ -187,10 +185,10 @@ group("common_components_unittest") {
 
       #"common_components/heap/collector/tests:host_unittest",
       "common_components/heap/w_collector/tests:host_unittest",
+      "common_components/log/tests:host_unittest",
       "common_components/mutator/tests:host_unittest",
       "common_components/objects/tests:host_unittest",
       "common_components/thread/tests:host_unittest",
-      "common_components/log/tests:host_unittest",
     ]
   }
 }
@@ -304,7 +302,7 @@ ohos_static_library("ark_runtime_host_unittest") {
   subsystem_name = "arkcompiler"
 }
 
-config("ark_jsruntime_public_config") {
+config("ark_public_config") {
   configs = [
     "$ark_root/common_interfaces:common_interfaces_public_config",
     "$ark_root/libpandabase:arkbase_public_config",
@@ -318,10 +316,7 @@ config("ark_jsruntime_public_config") {
     ]
   }
 
-  include_dirs = [
-    "$js_root",
-    "$js_root/ecmascript/napi/include",
-  ]
+  include_dirs = [ "./" ]
 
   defines = []
   ldflags = []
@@ -341,6 +336,11 @@ config("ark_jsruntime_public_config") {
   }
 }
 
+config("ark_jsruntime_public_config") {
+  configs = [ ":ark_public_config" ]
+  include_dirs = [ "./ecmascript/napi/include" ]
+}
+
 intl_sources = []
 
 if (enable_ark_intl) {
@@ -406,7 +406,7 @@ config("hiviewdfx_config") {
   include_dirs = [ "$hilog_root/include" ]
 }
 
-config("ark_jsruntime_common_config") {
+config("ark_common_config") {
   configs = [ ":hiviewdfx_config" ]
 
   defines = [ "PANDA_ENABLE_LTO" ]
@@ -415,6 +415,7 @@ config("ark_jsruntime_common_config") {
     defines += [ "ENABLE_COLD_STARTUP_GC_POLICY" ]
   }
   if (ets_runtime_enable_cmc_gc) {
+    print("########## ets_runtime enable cmc-gc ##############")
     defines += [ "USE_CMC_GC" ]
     if (ets_runtime_enable_cmc_rb_dfx) {
       defines += [ "ENABLE_CMC_RB_DFX" ]
@@ -512,19 +513,6 @@ config("ark_jsruntime_common_config") {
     defines += [ "ENABLE_QOS" ]
   }
 
-
-  if (ark_compile_mode != "release") {
-    ark_profiler_features = [
-      "ECMASCRIPT_SUPPORT_CPUPROFILER",
-      "ECMASCRIPT_SUPPORT_HEAPPROFILER",
-      "ECMASCRIPT_SUPPORT_HEAPSAMPLING",
-      "ECMASCRIPT_SUPPORT_SNAPSHOT",
-      "ECMASCRIPT_SUPPORT_TRACING",
-    ]
-    defines += [ "ECMASCRIPT_SUPPORT_DEBUGGER" ]
-    defines += ark_profiler_features
-  }
-
   ldflags = []
   if (is_linux) {
     defines += [
@@ -546,11 +534,6 @@ config("ark_jsruntime_common_config") {
     ]
 
     ldflags += [ "-lshlwapi" ]
-
-    # not support profiler on Windows yet
-    if (ark_compile_mode != "release") {
-      defines -= ark_profiler_features
-    }
   } else if (is_mac) {
     cflags_cc += [ "-std=c++17" ]
     defines += [
@@ -558,11 +541,6 @@ config("ark_jsruntime_common_config") {
       "PANDA_TARGET_UNIX",
       "PANDA_TARGET_MACOS",
     ]
-
-    # not support profiler on MacOS yet
-    if (ark_compile_mode != "release") {
-      defines -= ark_profiler_features
-    }
   } else if (target_os == "android") {
     defines += [
       "PANDA_TARGET_ANDROID",
@@ -580,11 +558,6 @@ config("ark_jsruntime_common_config") {
       "PANDA_TARGET_IOS",
       "PANDA_TARGET_UNIX",
     ]
-
-    # not support profiler on iOS yet
-    if (ark_compile_mode != "release") {
-      defines -= ark_profiler_features
-    }
   } else {
     defines += [
       "PANDA_TARGET_UNIX",
@@ -703,14 +676,6 @@ config("ark_jsruntime_common_config") {
     }
   }
 
-  # is_asan: skynet config; run_with_asan: est_runtime enable asan config
-  if (is_asan) {
-    defines += [
-      "ECMASCRIPT_ENABLE_ASAN_DFX_CONFIG",
-      "ECMASCRIPT_ENABLE_ASAN_THREAD_CHECK",
-    ]
-  }
-
   code_encrypto_enable = true
   if (defined(global_parts_info) &&
       !defined(global_parts_info.security_code_crypto_metadata_process)) {
@@ -724,6 +689,35 @@ config("ark_jsruntime_common_config") {
   }
 }
 
+config("ark_jsruntime_common_config") {
+  configs = [ ":ark_common_config" ]
+
+  defines = []
+  if (ark_compile_mode != "release") {
+    ark_profiler_features = [
+      "ECMASCRIPT_SUPPORT_CPUPROFILER",
+      "ECMASCRIPT_SUPPORT_HEAPPROFILER",
+      "ECMASCRIPT_SUPPORT_HEAPSAMPLING",
+      "ECMASCRIPT_SUPPORT_SNAPSHOT",
+      "ECMASCRIPT_SUPPORT_TRACING",
+    ]
+    defines += [ "ECMASCRIPT_SUPPORT_DEBUGGER" ]
+
+    # not support profiler on Windows/Mac/iOS yet
+    if (!is_mingw && !is_mac && target_os != "ios") {
+      defines += ark_profiler_features
+    }
+  }
+
+  # is_asan: skynet config; run_with_asan: est_runtime enable asan config
+  if (is_asan) {
+    defines += [
+      "ECMASCRIPT_ENABLE_ASAN_DFX_CONFIG",
+      "ECMASCRIPT_ENABLE_ASAN_THREAD_CHECK",
+    ]
+  }
+}
+
 # ecmascript unit testcase config
 config("ecma_test_config") {
   visibility = [
diff --git a/common_components/BUILD.gn b/common_components/BUILD.gn
index 4361398f53c2a5512d7fd8ea935080cb22dc01e9..c140039ad1d8e7ce65716cff76e969cc315f028a 100755
--- a/common_components/BUILD.gn
+++ b/common_components/BUILD.gn
@@ -71,8 +71,8 @@ source_Profiler = [ "profiler/common_profiler_interface.cpp" ]
 
 ohos_source_set("libarkcommon-runtime") {
   configs = [
-    "..:ark_jsruntime_public_config",
-    "..:ark_jsruntime_common_config",
+    "..:ark_public_config",
+    "..:ark_common_config",
   ]
 
   cflags_cc = [ "-Wno-unused-lambda-capture" ]
@@ -98,261 +98,8 @@ ohos_source_set("libarkcommon-runtime") {
   subsystem_name = "arkcompiler"
 }
 
-config("common_components_public_config") {
-  configs = [
-    "$ark_root/common_interfaces:common_interfaces_public_config",
-    "$ark_root/libpandabase:arkbase_public_config",
-    "$ark_root/libpandafile:arkfile_public_config",
-  ]
-  if (ark_standalone_build ||
-      (defined(ohos_indep_compiler_enable) && !ohos_indep_compiler_enable)) {
-    configs += [
-      "$ark_third_party_root/icu/icu4c:icu_config",
-      sdk_libc_secshared_config,
-    ]
-  }
-
-  include_dirs = [
-    "//arkcompiler/ets_runtime",
-  ]
-
-  defines = []
-  ldflags = []
-
-  if (ark_hybrid) {
-    defines += [ "ARK_HYBRID" ]
-
-    if (current_cpu == "amd64" || current_cpu == "x64" ||
-        current_cpu == "x86_64") {
-      ldflags += [ "-latomic" ]
-    }
-  }
-
-  if (ark_js_hybrid) {
-    defines += [ "PANDA_JS_ETS_HYBRID_MODE" ]
-    configs += [ "$ark_root/arkplatform:arkplatform_public_config" ]
-  }
-}
-
-config("common_components_common_config") {
-  configs = [ "//arkcompiler/ets_runtime/:hiviewdfx_config" ]
-
-  defines = [ "PANDA_ENABLE_LTO" ]
-
-  if (ets_runtime_enable_cmc_gc) {
-    defines += [ "USE_CMC_GC" ]
-    if (is_ohos && current_cpu == "arm64") {
-      defines += [ "ENABLE_COLD_STARTUP_GC_POLICY" ]
-    }
-  } else {
-    print("########## ets_runtime disable cmc-gc ##############")
-  }
-
-  if (ark_standalone_build) {
-    defines += [ "STANDALONE_MODE" ]
-  }
-
-  if (enable_next_optimization) {
-    defines += [ "NEXT_OPTIMIZATION_MACRO" ]
-  }
-
-  cflags_cc = [
-    "-Wall",
-    "-Wshadow",
-    "-Werror",
-    "-Wextra",
-    "-pedantic",
-    "-Wno-invalid-offsetof",
-    "-Wno-gnu-statement-expression",
-    "-pipe",
-    "-Wdate-time",
-    "-funwind-tables",
-    "-fno-rtti",
-    "-fasynchronous-unwind-tables",
-    "-Wformat=2",
-    "-std=c++17",
-  ]
-
-  cflags_cc += [
-    "-Wno-unused-command-line-argument",
-    "-Wno-variadic-macros",
-    "-Wno-gnu-anonymous-struct",
-    "-Wno-zero-length-array",
-    "-Wno-nested-anon-types",
-    "-Wno-c99-extensions",
-    "-Wno-unused-parameter",
-    "-Wno-shadow",
-    "-Wno-pedantic",
-    "-Wno-gnu-zero-variadic-macro-arguments",
-    "-Wno-unused-lambda-capture",
-    "-Wno-unused-function",
-    "-Wno-unused-variable",
-    "-Wno-unused-but-set-variable",
-  ]
-  cflags_c = []
-
-  if (is_ohos && is_clang && (target_cpu == "arm" || target_cpu == "arm64")) {
-    if (ets_runtime_feature_enable_pgo) {
-      cflags = [
-        "-fprofile-use=" + rebase_path(
-                "${ets_runtime_feature_pgo_path}/libark_jsruntime.profdata",
-                root_build_dir),
-        "-Wno-error=backend-plugin",
-        "-Wno-profile-instr-out-of-date",
-        "-Wno-profile-instr-unprofiled",
-        "-mllvm",
-        "-enable-partial-inlining",
-      ]
-    }
-  }
-
-  if (use_musl) {
-    defines += [ "PANDA_USE_MUSL" ]
-  }
-
-  if (build_public_version) {
-    defines += [ "IS_PUBLIC_VERSION" ]
-  }
-
-  if (is_arkui_x) {
-    defines += [ "CROSS_PLATFORM" ]
-  }
-
-  if (target_os == "android") {
-    defines += [ "ANDROID_PLATFORM" ]
-  }
-
-  if (is_ohos) {
-    defines += [ "PANDA_TARGET_OHOS" ]
-  }
-
-  if (is_qemu_runtime && is_ohos) {
-    defines += [ "OHOS_FOR_QEMU" ]
-  }
-
-  if (use_libfuzzer) {
-    defines += [ "FUZZ_TEST" ]
-  }
-
-  if (is_fastverify) {
-    cflags_cc += [
-      "-O3",
-      "-ggdb3",
-      "-gdwarf-4",
-      "-fno-omit-frame-pointer",
-      "-D_GLIBCXX_ASSERTIONS",
-    ]
-    cflags_c += [
-      "-O3",
-      "-ggdb3",
-      "-gdwarf-4",
-      "-fno-omit-frame-pointer",
-      "-D_GLIBCXX_ASSERTIONS",
-    ]
-  } else if (is_debug) {
-    cflags_cc += [
-      "-O0",
-      "-ggdb3",
-      "-gdwarf-4",
-    ]
-  } else {
-    defines += [ "NDEBUG" ]
-  }
-
-  if (enable_asm_assert) {
-    defines += [ "ENABLE_ASM_ASSERT" ]
-  }
-
-  if (run_with_asan) {
-    defines += [ "RUN_WITH_ASAN" ]
-  }
-
-  if (enable_cow_array) {
-    defines += [ "ENABLE_COW_ARRAY" ]
-  }
-
-  if (current_cpu == "arm") {
-    defines += [
-      "PANDA_TARGET_ARM32_ABI_SOFT=1",
-      "PANDA_TARGET_ARM32",
-      "PANDA_TARGET_32",
-    ]
-  } else if (current_cpu == "arm64") {
-    defines += [
-      "PANDA_TARGET_ARM64",
-      "PANDA_TARGET_64",
-      "PANDA_ENABLE_GLOBAL_REGISTER_VARIABLES",
-      "PANDA_USE_32_BIT_POINTER",
-    ]
-  } else if (current_cpu == "x86") {
-    defines += [ "PANDA_TARGET_X86" ]
-  } else if (current_cpu == "amd64" || current_cpu == "x64" ||
-             current_cpu == "x86_64") {
-    defines += [
-      "PANDA_TARGET_64",
-      "PANDA_TARGET_AMD64",
-      "PANDA_USE_32_BIT_POINTER",
-    ]
-  }
-  if (enable_ark_intl) {
-    defines += [ "ARK_SUPPORT_INTL" ]
-  } else {
-    if (target_os == "android" || target_os == "ios") {
-      defines += [ "ARK_NOT_SUPPORT_INTL_GLOBAL" ]
-    } else {
-      configs += [ "$global_root/frameworks/intl:intl_util_config" ]
-    }
-  }
-
-  if (enable_handle_leak_detect) {
-    defines += [ "ENABLE_LOCAL_HANDLE_LEAK_DETECT" ]
-  }
-
-  if (is_ohos && is_standard_system) {
-    defines += [ "ENABLE_EXCEPTION_BACKTRACE" ]
-
-    if (use_musl && (current_cpu == "arm" || current_cpu == "arm64") &&
-        !is_mac && !is_mingw && target_os != "ios" && !is_asan) {
-      defines += [ "HOOK_ENABLE" ]
-    }
-  }
-
-  code_encrypto_enable = true
-  if (defined(global_parts_info) &&
-      !defined(global_parts_info.security_code_crypto_metadata_process)) {
-    code_encrypto_enable = false
-  }
-  if (is_mingw && ark_standalone_build) {
-    code_encrypto_enable = false
-  }
-  if (code_encrypto_enable) {
-    defines += [ "CODE_ENCRYPTION_ENABLE" ]
-  }
-}
-
-# common_components unit testcase config
 config("common_components_test_config") {
-  visibility = [
-    "./*",
-  ]
-
-  configs = [
-    ":common_components_public_config",
-    ":common_components_common_config",
-  ]
-
-  if (enable_handle_leak_detect) {
-    defines = [ "ENABLE_LOCAL_HANDLE_LEAK_DETECT" ]
-  }
-  if (!is_mac) {
-    ldflags = [ "-Wl,-rpath=\$ORIGIN/" ]
-  } else {
-    ldflags = [ "-Wl" ]
-  }
-
-  if (!ark_standalone_build) {
-    ldflags += [ "-Wl,--lto-O0" ]
-  }
+  configs = [ "..:ecma_test_config" ]
 }
 
 ohos_shared_library("libark_common_components_test") {
@@ -362,24 +109,24 @@ ohos_shared_library("libark_common_components_test") {
   configs = [ ":common_components_test_config" ]
 
   sources = [
+    "base/utf_helper.cpp",
     "base_runtime/base_runtime.cpp",
     "base_runtime/base_runtime_param.cpp",
-    "base/utf_helper.cpp",
     "heap/heap_allocator.cpp",
+    "heap/heap_visitor.cpp",
     "log/log.cpp",
     "objects/base_object.cpp",
-    "objects/base_string_table.cpp",
     "objects/base_string.cpp",
+    "objects/base_string_table.cpp",
     "objects/composite_base_class.cpp",
-    "taskpool/taskpool.cpp",
+    "platform/unix/map.cpp",
+    "profiler/heap_profiler_listener.cpp",
     "taskpool/runner.cpp",
     "taskpool/task_queue.cpp",
+    "taskpool/taskpool.cpp",
     "tests/test_hooks.cpp",
-    "heap/heap_visitor.cpp",
-    "profiler/heap_profiler_listener.cpp",
     "thread/thread_holder.cpp",
     "thread/thread_holder_manager.cpp",
-    "platform/unix/map.cpp",
   ]
 
   if (is_mingw) {
@@ -406,20 +153,20 @@ ohos_shared_library("libark_common_components_test") {
 
   deps = [ ":libarkcommon-runtime" ]
 
-  public_configs = [ ":common_components_public_config" ]
-  public_configs += [ "//arkcompiler/ets_runtime:include_llvm" ]
+  public_configs = [ "..:ark_public_config" ]
+  public_configs += [ "..:include_llvm" ]
 
   external_deps = []
   if (!ark_standalone_build) {
     public_external_deps = [
-      "zlib:libz",
       "bounds_checking_function:libsec_shared",
+      "zlib:libz",
     ]
     public_external_deps += hiviewdfx_ext_deps
   } else {
     external_deps += [
-      "zlib:libz",
       "bounds_checking_function:libsec_shared",
+      "zlib:libz",
     ]
     external_deps += hiviewdfx_ext_deps
   }
diff --git a/common_components/base/tests/BUILD.gn b/common_components/base/tests/BUILD.gn
index 39e86f58d2ed0cbdc56ec3a7cdcd8f967e4197f8..c56807d60ca7d31564f29cfa41c834feb88ac0d2 100755
--- a/common_components/base/tests/BUILD.gn
+++ b/common_components/base/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("C_String_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -42,16 +44,12 @@ group("unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":C_String_Test",
-  ]
+  deps = [ ":C_String_Test" ]
 }
 
 group("host_unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":C_String_TestAction",
-  ]
-}
\ No newline at end of file
+  deps = [ ":C_String_TestAction" ]
+}
diff --git a/common_components/base_runtime/tests/BUILD.gn b/common_components/base_runtime/tests/BUILD.gn
index 6e1eba260b1faeb905b3c71c57b6590e8a38949d..271183b59299abfd1ea8410e5cdb8b41e02c1933 100644
--- a/common_components/base_runtime/tests/BUILD.gn
+++ b/common_components/base_runtime/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("Base_Runtime_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -42,16 +44,12 @@ group("unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Base_Runtime_Test",
-  ]
+  deps = [ ":Base_Runtime_Test" ]
 }
 
 group("host_unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Base_Runtime_TestAction",
-  ]
-}
\ No newline at end of file
+  deps = [ ":Base_Runtime_TestAction" ]
+}
diff --git a/common_components/common/tests/BUILD.gn b/common_components/common/tests/BUILD.gn
index 09fbabcdd34e39e4926672245866ea5717b5864a..708c9a3bf09e03d3e553e1dddc5d098a25a9ed06 100644
--- a/common_components/common/tests/BUILD.gn
+++ b/common_components/common/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("Page_Cache_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -42,16 +44,12 @@ group("unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Page_Cache_Test",
-  ]
+  deps = [ ":Page_Cache_Test" ]
 }
 
 group("host_unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Page_Cache_TestAction",
-  ]
-}
\ No newline at end of file
+  deps = [ ":Page_Cache_TestAction" ]
+}
diff --git a/common_components/heap/allocator/tests/BUILD.gn b/common_components/heap/allocator/tests/BUILD.gn
index 5acba71f6e2fabafcfebe26ac448b6791542e237..7596ed570475f29e4576221db4ab39e76850f18f 100755
--- a/common_components/heap/allocator/tests/BUILD.gn
+++ b/common_components/heap/allocator/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("Allocator_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -38,7 +40,6 @@ host_unittest_action("Allocator_Test") {
   ]
 }
 
-
 host_unittest_action("Region_Manager_Test") {
   module_out_path = module_output_path
 
@@ -52,14 +53,16 @@ host_unittest_action("Region_Manager_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
+    "bounds_checking_function:libsec_shared",
     "icu:shared_icui18n",
     "icu:shared_icuuc",
     "zlib:libz",
-    "bounds_checking_function:libsec_shared",
   ]
 }
 
@@ -76,7 +79,9 @@ host_unittest_action("Treap_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -99,7 +104,9 @@ host_unittest_action("Region_Space_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -122,7 +129,9 @@ host_unittest_action("Heap_Allocator_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -138,10 +147,10 @@ group("unittest") {
   # deps file
   deps = [
     ":Allocator_Test",
-    ":Treap_Test",
-    ":Region_Space_Test",
     ":Heap_Allocator_Test",
-    ":Region_Manager_Test"
+    ":Region_Manager_Test",
+    ":Region_Space_Test",
+    ":Treap_Test",
   ]
 }
 
@@ -151,9 +160,9 @@ group("host_unittest") {
   # deps file
   deps = [
     ":Allocator_TestAction",
-    ":Treap_TestAction",
-    ":Region_Space_TestAction",
     ":Heap_Allocator_TestAction",
-    ":Region_Manager_TestAction"
+    ":Region_Manager_TestAction",
+    ":Region_Space_TestAction",
+    ":Treap_TestAction",
   ]
 }
diff --git a/common_components/heap/barrier/tests/BUILD.gn b/common_components/heap/barrier/tests/BUILD.gn
index 992543294d9edb63649421c2bed52d6ff3fedfc7..67116442480b669db55cf9211d5fc25e3f288b5f 100644
--- a/common_components/heap/barrier/tests/BUILD.gn
+++ b/common_components/heap/barrier/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("Barrier_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -42,16 +44,12 @@ group("unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Barrier_Test",
-  ]
+  deps = [ ":Barrier_Test" ]
 }
 
 group("host_unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Barrier_TestAction",
-  ]
-}
\ No newline at end of file
+  deps = [ ":Barrier_TestAction" ]
+}
diff --git a/common_components/heap/collector/tests/BUILD.gn b/common_components/heap/collector/tests/BUILD.gn
index 20a34d4289709824629fe2663dcf71b8349d9011..c167caaecdc1808c732c978d8dd2be4ce9a34fec 100755
--- a/common_components/heap/collector/tests/BUILD.gn
+++ b/common_components/heap/collector/tests/BUILD.gn
@@ -29,7 +29,9 @@ host_unittest_action("Collector_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -52,7 +54,9 @@ host_unittest_action("Trace_Collector_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -75,7 +79,9 @@ host_unittest_action("Task_Queue_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -98,7 +104,9 @@ host_unittest_action("Gc_Request_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -114,9 +122,9 @@ group("unittest") {
   # deps file
   deps = [
     ":Collector_Test",
-    ":Trace_Collector_Test",
-    ":Task_Queue_Test",
     ":Gc_Request_Test",
+    ":Task_Queue_Test",
+    ":Trace_Collector_Test",
   ]
 }
 
@@ -126,9 +134,8 @@ group("host_unittest") {
   # deps file
   deps = [
     ":Collector_TestAction",
-    ":Trace_Collector_TestAction",
-    ":Task_Queue_TestAction",
     ":Gc_Request_TestAction",
+    ":Task_Queue_TestAction",
+    ":Trace_Collector_TestAction",
   ]
 }
-
diff --git a/common_components/heap/w_collector/tests/BUILD.gn b/common_components/heap/w_collector/tests/BUILD.gn
index 31bcb39b94be7c2ee498e96b05b3ab053de8bc40..66ba2eafaa1ae8017cf96b9299cc31659c031f57 100755
--- a/common_components/heap/w_collector/tests/BUILD.gn
+++ b/common_components/heap/w_collector/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("Copy_Barrier_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -50,7 +52,9 @@ host_unittest_action("Enum_Barrier_Test") {
     "//arkcompiler/ets_runtime/common_components:common_components_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -73,7 +77,9 @@ host_unittest_action("Idle_Barrier_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -96,7 +102,9 @@ host_unittest_action("Post_Trace_Barrier_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -119,7 +127,9 @@ host_unittest_action("Preforward_Barrier_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -142,7 +152,9 @@ host_unittest_action("Remark_Barrier_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -165,7 +177,9 @@ host_unittest_action("Trace_Barrier_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -188,7 +202,9 @@ host_unittest_action("W_Collector_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -228,4 +244,4 @@ group("host_unittest") {
     ":Trace_Barrier_TestAction",
     ":W_Collector_TestAction",
   ]
-}
\ No newline at end of file
+}
diff --git a/common_components/log/tests/BUILD.gn b/common_components/log/tests/BUILD.gn
index 2ecfd0aa452a942d8f401afe2c0d618c12fc88f6..b90a808e05d0c20dcc35fcd4aa37ba262fae2428 100644
--- a/common_components/log/tests/BUILD.gn
+++ b/common_components/log/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("Log_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -42,16 +44,12 @@ group("unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Log_Test",
-  ]
+  deps = [ ":Log_Test" ]
 }
 
 group("host_unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Log_TestAction",
-  ]
-}
\ No newline at end of file
+  deps = [ ":Log_TestAction" ]
+}
diff --git a/common_components/mutator/tests/BUILD.gn b/common_components/mutator/tests/BUILD.gn
index 442f3c15abc184ea51473ab9318871c1cf0c895c..8225d41c4705c42fae915ba290eff7e7ae19a7e9 100755
--- a/common_components/mutator/tests/BUILD.gn
+++ b/common_components/mutator/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("Mutator_Manager_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -51,7 +53,9 @@ host_unittest_action("Satb_Buffer_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -65,16 +69,12 @@ group("unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Mutator_Manager_Test",
-  ]
+  deps = [ ":Mutator_Manager_Test" ]
 }
 
 group("host_unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Mutator_Manager_TestAction",
-  ]
+  deps = [ ":Mutator_Manager_TestAction" ]
 }
diff --git a/common_components/objects/tests/BUILD.gn b/common_components/objects/tests/BUILD.gn
index e6d55ad7b48d80040124371fc808a3d69a2713c7..75c921ab4226311a570b824865bd9a8010cbc584 100755
--- a/common_components/objects/tests/BUILD.gn
+++ b/common_components/objects/tests/BUILD.gn
@@ -20,9 +20,9 @@ host_unittest_action("Base_String_Test") {
 
   sources = [
     # test file
-    "base_string_test.cpp",
-    "//arkcompiler/ets_runtime/common_components/objects/base_string.cpp",
     "//arkcompiler/ets_runtime/common_components/base/utf_helper.cpp",
+    "//arkcompiler/ets_runtime/common_components/objects/base_string.cpp",
+    "base_string_test.cpp",
   ]
 
   configs = [
@@ -30,7 +30,9 @@ host_unittest_action("Base_String_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -44,16 +46,12 @@ group("unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Base_String_Test",
-  ]
+  deps = [ ":Base_String_Test" ]
 }
 
 group("host_unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Base_String_TestAction",
-  ]
+  deps = [ ":Base_String_TestAction" ]
 }
diff --git a/common_components/tests/test_helper.gni b/common_components/tests/test_helper.gni
index 6b97cb62de4eff0aeb855bd23ab5abda1ac92172..e11879883c9855b184764376afc0be1daabf354a 100644
--- a/common_components/tests/test_helper.gni
+++ b/common_components/tests/test_helper.gni
@@ -15,7 +15,7 @@ import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/test.gni")
 
 if (!defined(ark_standalone_build)) {
-ark_standalone_build = false
+  ark_standalone_build = false
 }
 
 if (is_standard_system || ark_standalone_build) {
@@ -136,4 +136,4 @@ template("host_unittest_action") {
       deps += [ ":${_target_name_}ActionWithoutQemu" ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/common_components/thread/tests/BUILD.gn b/common_components/thread/tests/BUILD.gn
index 1a57336aaaefb23c3e975ea0b7aafb894714655c..cc2d9e1a28c9ff569aed2dce2fea63414f185fde 100755
--- a/common_components/thread/tests/BUILD.gn
+++ b/common_components/thread/tests/BUILD.gn
@@ -28,7 +28,9 @@ host_unittest_action("Thread_Holder_Test") {
     "//arkcompiler/ets_runtime:icu_path_test_config",
   ]
 
-  deps = [ "//arkcompiler/ets_runtime/common_components:libark_common_components_test" ]
+  deps = [
+    "//arkcompiler/ets_runtime/common_components:libark_common_components_test",
+  ]
 
   # hiviewdfx libraries
   external_deps = [
@@ -42,16 +44,12 @@ group("unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Thread_Holder_Test",
-  ]
+  deps = [ ":Thread_Holder_Test" ]
 }
 
 group("host_unittest") {
   testonly = true
 
   # deps file
-  deps = [
-    ":Thread_Holder_TestAction",
-  ]
-}
\ No newline at end of file
+  deps = [ ":Thread_Holder_TestAction" ]
+}
diff --git a/compiler_service/BUILD.gn b/compiler_service/BUILD.gn
index ade3a39216deffaf7d1561bd9f2e49f2dbd9a116..59c21860e3aae086afee8a4901cfea5372528916 100644
--- a/compiler_service/BUILD.gn
+++ b/compiler_service/BUILD.gn
@@ -57,8 +57,8 @@ ohos_shared_library("libcompiler_service") {
   ]
   if (enable_target_compilation) {
     sources += [
-      "${js_root}/ecmascript/platform/unix/ohos/directory.cpp",
       "${js_root}/ecmascript/platform/unix/linux/os.cpp",
+      "${js_root}/ecmascript/platform/unix/ohos/directory.cpp",
     ]
   } else if (is_mingw) {
     sources += [
diff --git a/compiler_service/test/unittest/aotcompilerargshandler_unit/BUILD.gn b/compiler_service/test/unittest/aotcompilerargshandler_unit/BUILD.gn
index 94cfaa11a2c0c1bab4ec0c4013478687fe20750c..29d6a263ac293481f9a3da2ed925b6ad398a0b9e 100644
--- a/compiler_service/test/unittest/aotcompilerargshandler_unit/BUILD.gn
+++ b/compiler_service/test/unittest/aotcompilerargshandler_unit/BUILD.gn
@@ -23,9 +23,7 @@ ohos_unittest("AotCompilerArgsHandlerUnitTest") {
   module_out_path = module_output_path
   sources = aot_compiler_service_sources
   configs = [ ":module_private_config" ]
-  deps = [
-    "${compiler_service_root}:libcompiler_service",
-  ]
+  deps = [ "${compiler_service_root}:libcompiler_service" ]
   external_deps = [
     "ability_base:want",
     "access_token:libaccesstoken_sdk",
diff --git a/compiler_service/test/unittest/aotcompilerclient_unit/BUILD.gn b/compiler_service/test/unittest/aotcompilerclient_unit/BUILD.gn
index 56486c917be04a8232a479f60e33168af625013c..4c22748971cbd26a396ab36e9cd5ef8c8a996831 100644
--- a/compiler_service/test/unittest/aotcompilerclient_unit/BUILD.gn
+++ b/compiler_service/test/unittest/aotcompilerclient_unit/BUILD.gn
@@ -24,9 +24,7 @@ ohos_unittest("AotCompilerClientUnitTest") {
   module_out_path = module_output_path
   sources = aot_compiler_service_sources
   configs = [ ":module_private_config" ]
-  deps = [
-    "${compiler_service_root}:libcompiler_service",
-  ]
+  deps = [ "${compiler_service_root}:libcompiler_service" ]
   external_deps = [
     "ability_base:want",
     "access_token:libaccesstoken_sdk",
diff --git a/compiler_service/test/unittest/aotcompilererrorutils_unit/BUILD.gn b/compiler_service/test/unittest/aotcompilererrorutils_unit/BUILD.gn
index 217637c99f2b0eb0e217800d4da158ea6020fba1..b024dcc1e4344e4597c1c7587febee981f74f2af 100644
--- a/compiler_service/test/unittest/aotcompilererrorutils_unit/BUILD.gn
+++ b/compiler_service/test/unittest/aotcompilererrorutils_unit/BUILD.gn
@@ -23,9 +23,7 @@ ohos_unittest("AotCompilerErrorUtilsUnitTest") {
   module_out_path = module_output_path
   sources = aot_compiler_service_sources
   configs = [ ":module_private_config" ]
-  deps = [
-    "${compiler_service_root}:libcompiler_service",
-  ]
+  deps = [ "${compiler_service_root}:libcompiler_service" ]
   external_deps = [
     "ability_base:want",
     "access_token:libaccesstoken_sdk",
diff --git a/compiler_service/test/unittest/aotcompilerimpl_unit/BUILD.gn b/compiler_service/test/unittest/aotcompilerimpl_unit/BUILD.gn
index 4a8101c770e9df4057c82a5161e9082f1d6cc86f..1b5c10efaf0a8fdb64e77b500e8a287ebc83f9f5 100644
--- a/compiler_service/test/unittest/aotcompilerimpl_unit/BUILD.gn
+++ b/compiler_service/test/unittest/aotcompilerimpl_unit/BUILD.gn
@@ -24,18 +24,16 @@ ohos_unittest("AotCompilerImplUnitTest") {
   module_out_path = module_output_path
   sources = aot_compiler_service_sources
   configs = [ ":module_private_config" ]
-  deps = [
-    "${compiler_service_root}:libcompiler_service",
-  ]
+  deps = [ "${compiler_service_root}:libcompiler_service" ]
   external_deps = [
     "ability_base:want",
     "access_token:libaccesstoken_sdk",
     "access_token:libtokenid_sdk",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "eventhandler:libeventhandler",
     "googletest:gmock_main",
     "googletest:gtest_main",
-    "eventhandler:libeventhandler",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
diff --git a/compiler_service/test/unittest/aotcompilerproxy_unit/BUILD.gn b/compiler_service/test/unittest/aotcompilerproxy_unit/BUILD.gn
index d357201e08a7ec8789a1d09abd1df9fac96ea8ad..8762196d3318a5361f125755d04f37c983a3821f 100644
--- a/compiler_service/test/unittest/aotcompilerproxy_unit/BUILD.gn
+++ b/compiler_service/test/unittest/aotcompilerproxy_unit/BUILD.gn
@@ -23,9 +23,7 @@ ohos_unittest("AotCompilerProxyUnitTest") {
   module_out_path = module_output_path
   sources = aot_compiler_service_sources
   configs = [ ":module_private_config" ]
-  deps = [
-    "${compiler_service_root}:libcompiler_service",
-  ]
+  deps = [ "${compiler_service_root}:libcompiler_service" ]
   external_deps = [
     "ability_base:want",
     "access_token:libaccesstoken_sdk",
diff --git a/compiler_service/test/unittest/aotcompilerservice_unit/BUILD.gn b/compiler_service/test/unittest/aotcompilerservice_unit/BUILD.gn
index 2af81ac72ac96b294ce267a6d690cb6e2ed9330a..9696d6f4fb3d5a216fdc14164dab33f1796cd763 100644
--- a/compiler_service/test/unittest/aotcompilerservice_unit/BUILD.gn
+++ b/compiler_service/test/unittest/aotcompilerservice_unit/BUILD.gn
@@ -24,9 +24,7 @@ ohos_unittest("AotCompilerServiceUnitTest") {
   module_out_path = module_output_path
   sources = aot_compiler_service_sources
   configs = [ ":module_private_config" ]
-  deps = [
-    "${compiler_service_root}:libcompiler_service",
-  ]
+  deps = [ "${compiler_service_root}:libcompiler_service" ]
   external_deps = [
     "ability_base:want",
     "access_token:libaccesstoken_sdk",
diff --git a/compiler_service/test/unittest/aotcompilerstub_unit/BUILD.gn b/compiler_service/test/unittest/aotcompilerstub_unit/BUILD.gn
index a65dedc566626b21f70d6ae4993c7407af31250c..fc1b0f96069725e902c165b9ff6645b090e3eca1 100644
--- a/compiler_service/test/unittest/aotcompilerstub_unit/BUILD.gn
+++ b/compiler_service/test/unittest/aotcompilerstub_unit/BUILD.gn
@@ -23,9 +23,7 @@ ohos_unittest("AotCompilerStubUnitTest") {
   module_out_path = module_output_path
   sources = aot_compiler_service_sources
   configs = [ ":module_private_config" ]
-  deps = [
-    "${compiler_service_root}:libcompiler_service",
-  ]
+  deps = [ "${compiler_service_root}:libcompiler_service" ]
   external_deps = [
     "ability_base:want",
     "access_token:libaccesstoken_sdk",
@@ -33,9 +31,9 @@ ohos_unittest("AotCompilerStubUnitTest") {
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "eventhandler:libeventhandler",
-    "hilog:libhilog",
     "googletest:gmock_main",
     "googletest:gtest_main",
+    "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
     "icu:shared_icui18n",
diff --git a/ecmascript/compiler/aot_file/tests/BUILD.gn b/ecmascript/compiler/aot_file/tests/BUILD.gn
index 26c07a3f8a18bc1e2ca70d8416fa417f0b140843..a0c21e664564e611229f99363ceed050c31b94c5 100644
--- a/ecmascript/compiler/aot_file/tests/BUILD.gn
+++ b/ecmascript/compiler/aot_file/tests/BUILD.gn
@@ -157,8 +157,8 @@ group("unittest") {
   deps += [
     ":AOTChecksumTest",
     ":AOTFileTest",
-    ":BinaryBufferParserTest",
     ":AnFileInfoTest",
+    ":BinaryBufferParserTest",
   ]
 
   # CMC-GC UT FIX LATER
diff --git a/ecmascript/napi/test/BUILD.gn b/ecmascript/napi/test/BUILD.gn
index 2c6c9bc6ea538d06a7da903331636b4b015bde56..400ddd46b4f15123fea0d2fe94571a96d3bc25fc 100644
--- a/ecmascript/napi/test/BUILD.gn
+++ b/ecmascript/napi/test/BUILD.gn
@@ -24,9 +24,7 @@ test_js_files = [
   "termination",
 ]
 
-test_ts_files = [
-  "module_export"
-]
+test_ts_files = [ "module_export" ]
 
 foreach(file, test_ts_files) {
   es2abc_gen_abc("gen_${file}_abc") {
@@ -89,7 +87,7 @@ host_unittest_action("Jsnapi_001_Test") {
   } else {
     test_abc_dir = rebase_path(target_out_dir)
   }
-  defines = ["ABC_PATH=\"${test_abc_dir}/\""]
+  defines = [ "ABC_PATH=\"${test_abc_dir}/\"" ]
 
   # hiviewdfx libraries
   external_deps = hiviewdfx_ext_deps
diff --git a/ecmascript/tests/BUILD.gn b/ecmascript/tests/BUILD.gn
index 33f81666e19def04e4cce291499a6d865a7f2dcf..a47b5d2d911f2fc477196176504a028d9948dcf5 100644
--- a/ecmascript/tests/BUILD.gn
+++ b/ecmascript/tests/BUILD.gn
@@ -291,8 +291,8 @@ host_unittest_action("ECMA_StringTable_Test") {
 
   sources = [
     # test file
-    "ecma_string_table_test.cpp",
     "base_string_table_test.cpp",
+    "ecma_string_table_test.cpp",
   ]
 
   configs = [
@@ -3471,13 +3471,12 @@ group("unittest") {
 
   # deps file
   deps = [
+    ":BASE_String_Test",
     ":Builtins_Test",
     ":ECMA_StringAccessor_Test",
     ":ECMA_StringEquals_Test",
     ":ECMA_StringHash_Test",
     ":ECMA_StringTable_Test",
-
-    ":BASE_String_Test",
     ":ECMA_VM_Test",
     ":GC_ConcurrentMarking_Test",
     ":GC_ConcurrentSweep_Test",
@@ -3604,7 +3603,7 @@ group("unittest") {
     ":Sendable_SharedObjectFactory_Test",
   ]
 
- # TODO: CMC-GC UT FIX LATER
+  # TODO: CMC-GC UT FIX LATER
   if (ets_runtime_enable_cmc_gc) {
     deps -= [
       ":GC_ConcurrentMarking_Test",
@@ -3643,13 +3642,12 @@ group("host_unittest") {
 
   # deps file
   deps = [
+    ":BASE_String_TestAction",
     ":Builtins_TestAction",
     ":ECMA_StringAccessor_TestAction",
     ":ECMA_StringEquals_TestAction",
     ":ECMA_StringHash_TestAction",
     ":ECMA_StringTable_TestAction",
-
-    ":BASE_String_TestAction",
     ":ECMA_VM_TestAction",
     ":GC_ConcurrentMarking_TestAction",
     ":GC_ConcurrentSweep_TestAction",
@@ -3778,13 +3776,12 @@ group("host_unittest") {
 
   if (is_mac) {
     deps -= [
+      ":BASE_String_TestAction",
       ":Builtins_TestAction",
       ":ECMA_StringAccessor_TestAction",
       ":ECMA_StringEquals_TestAction",
       ":ECMA_StringHash_TestAction",
       ":ECMA_StringTable_TestAction",
-
-      ":BASE_String_TestAction",
       ":ECMA_VM_TestAction",
       ":GC_ConcurrentMarking_TestAction",
       ":GC_ConcurrentSweep_TestAction",
diff --git a/js_runtime_config.gni b/js_runtime_config.gni
index 275b5678eb83f08580d819cf9010819701947962..a9974998e9911bfacc97b69562ccce381943f05f 100644
--- a/js_runtime_config.gni
+++ b/js_runtime_config.gni
@@ -70,7 +70,7 @@ declare_args() {
   # NOTE(ipetrov): Need to enable for mac previewer
   ark_js_hybrid = !ark_standalone_build && !is_mac
 
-  ets_runtime_enable_cmc_gc = (!is_mac && !is_mingw)
+  ets_runtime_enable_cmc_gc = !is_mac && !is_mingw
 
   enable_handle_leak_detect = false
 }
@@ -164,9 +164,8 @@ enable_hitrace =
 enable_unwinder =
     !ark_standalone_build && !(defined(is_arkui_x) && is_arkui_x) && is_ohos &&
     is_standard_system && !is_qemu_runtime
-enable_rss = 
-    !ark_standalone_build && !(defined(is_arkui_x) && is_arkui_x) && is_ohos &&
-    is_standard_system && !is_qemu_runtime
+enable_rss = !ark_standalone_build && !(defined(is_arkui_x) && is_arkui_x) &&
+             is_ohos && is_standard_system && !is_qemu_runtime
 
 hiviewdfx_deps = []
 hiviewdfx_ext_deps = []
@@ -190,13 +189,16 @@ if (enable_hilog) {
 }
 if (enable_hisysevent) {
   hiviewdfx_ext_deps += [
+    "faultloggerd:dfx_signalhandler",
     "hisysevent:libhisysevent",
     "hiview:libucollection_client",
-    "faultloggerd:dfx_signalhandler",
   ]
 }
 if (enable_rss) {
-  hiviewdfx_ext_deps += [ "resource_schedule_service:ressched_client", "samgr:samgr_proxy" ]
+  hiviewdfx_ext_deps += [
+    "resource_schedule_service:ressched_client",
+    "samgr:samgr_proxy",
+  ]
 }
 if (is_ohos && is_standard_system && !is_arkui_x &&
     defined(global_parts_info) &&
diff --git a/test/aottest/asyncreenterinterpreter/BUILD.gn b/test/aottest/asyncreenterinterpreter/BUILD.gn
index c71840679782178db86eb12c1f96a09552f61cca..b8d0f79e9727953dabd15945ef19f0239b327b7c 100644
--- a/test/aottest/asyncreenterinterpreter/BUILD.gn
+++ b/test/aottest/asyncreenterinterpreter/BUILD.gn
@@ -15,4 +15,4 @@ import("//arkcompiler/ets_runtime/test/test_helper.gni")
 
 host_aot_js_test_action("asyncreenterinterpreter") {
   deps = []
-}
\ No newline at end of file
+}
diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn
index 7c45425e29271452361c0838f8ff804797c2530d..6b93948a082a06ee8e96436392735ee9421517a5 100644
--- a/test/fuzztest/BUILD.gn
+++ b/test/fuzztest/BUILD.gn
@@ -41,22 +41,25 @@ group("fuzztest") {
     "builtinsarraybufferisview_fuzzer:fuzztest",
     "builtinsarraybuffersetvalueinbufferforbyte_fuzzer:fuzztest",
     "builtinsarraybuffersetvalueinbufferforuint8clamped_fuzzer:fuzztest",
-    "containersfastbufferfill_fuzzer:fuzztest",
+    "commoncompbaseutf_fuzzer:fuzztest",
+    "commoncomplog_fuzzer:fuzztest",
+    "containersdequegetfirst_fuzzer:fuzztest",
+    "containersdequegetlast_fuzzer:fuzztest",
+    "containersdequehas_fuzzer:fuzztest",
+    "containersdequeinsertend_fuzzer:fuzztest",
+    "containersdequeinsertfront_fuzzer:fuzztest",
+    "containersdequeiterator_fuzzer:fuzztest",
+    "containersdequepopfirst_fuzzer:fuzztest",
+    "containersdequepoplast_fuzzer:fuzztest",
     "containersfastbuffercompare_fuzzer:fuzztest",
     "containersfastbuffercopy_fuzzer:fuzztest",
     "containersfastbufferequals_fuzzer:fuzztest",
+    "containersfastbufferfill_fuzzer:fuzztest",
     "containersfastbufferindexof_fuzzer:fuzztest",
     "containersfastbufferlastindexof_fuzzer:fuzztest",
     "containersfastbuffertostring_fuzzer:fuzztest",
     "containersfastbufferwrite_fuzzer:fuzztest",
     "containersfastbufferwritereadvalue_fuzzer:fuzztest",
-    "containersdequegetfirst_fuzzer:fuzztest",
-    "containersdequegetlast_fuzzer:fuzztest",
-    "containersdequehas_fuzzer:fuzztest",
-    "containersdequeinsertend_fuzzer:fuzztest",
-    "containersdequeiterator_fuzzer:fuzztest",
-    "containersdequepopfirst_fuzzer:fuzztest",
-    "containersdequepoplast_fuzzer:fuzztest",
     "containershashmap_fuzzer:fuzztest",
     "containershashmapclear_fuzzer:fuzztest",
     "containershashmapentries_fuzzer:fuzztest",
@@ -115,6 +118,7 @@ group("fuzztest") {
     "containerslightweightsettoarray_fuzzer:fuzztest",
     "containerslightweightsettostring_fuzzer:fuzztest",
     "containerslightweightsetvalues_fuzzer:fuzztest",
+    "containerslinkedlistadd_fuzzer:fuzztest",
     "containerslinkedlistaddfirst_fuzzer:fuzztest",
     "containerslinkedlistclear_fuzzer:fuzztest",
     "containerslinkedlistclone_fuzzer:fuzztest",
@@ -155,6 +159,16 @@ group("fuzztest") {
     "containerslistremovebyindex_fuzzer:fuzztest",
     "containerslistset_fuzzer:fuzztest",
     "containerslistsort_fuzzer:fuzztest",
+    "containersplainarrayaddhas_fuzzer:fuzztest",
+    "containersplainarrayget_fuzzer:fuzztest",
+    "containersplainarraygetindexofkey_fuzzer:fuzztest",
+    "containersplainarraygetindexofvalue_fuzzer:fuzztest",
+    "containersplainarraygetkeyat_fuzzer:fuzztest",
+    "containersplainarraygetvalueat_fuzzer:fuzztest",
+    "containersplainarrayremove_fuzzer:fuzztest",
+    "containersplainarrayremoveat_fuzzer:fuzztest",
+    "containersplainarrayremoverangefrom_fuzzer:fuzztest",
+    "containersplainarraysetvalueat_fuzzer:fuzztest",
     "containersprivatearraylist_fuzzer:fuzztest",
     "containersprivatedeque_fuzzer:fuzztest",
     "containersprivatehashmap_fuzzer:fuzztest",
@@ -205,37 +219,25 @@ group("fuzztest") {
     "containerstreemapset_fuzzer:fuzztest",
     "containerstreemapsetall_fuzzer:fuzztest",
     "containerstreemapvalues_fuzzer:fuzztest",
-    "containersdequeinsertfront_fuzzer:fuzztest",
-    "containerslinkedlistadd_fuzzer:fuzztest",
-    "containersplainarrayaddhas_fuzzer:fuzztest",
-    "containersplainarrayget_fuzzer:fuzztest",
-    "containersplainarraygetindexofkey_fuzzer:fuzztest",
-    "containersplainarraygetindexofvalue_fuzzer:fuzztest",
-    "containersplainarraygetkeyat_fuzzer:fuzztest",
-    "containersplainarrayremove_fuzzer:fuzztest",
-    "containersplainarrayremoveat_fuzzer:fuzztest",
-    "containersplainarrayremoverangefrom_fuzzer:fuzztest",
-    "containersplainarraysetvalueat_fuzzer:fuzztest",
-    "containersplainarraygetvalueat_fuzzer:fuzztest",
     "containerstreesetadd_fuzzer:fuzztest",
     "containerstreesetgethighervalue_fuzzer:fuzztest",
     "containerstreesetgetlowervalue_fuzzer:fuzztest",
     "containerstreesethas_fuzzer:fuzztest",
     "containerstreesetremove_fuzzer:fuzztest",
     "containersvectoradd_fuzzer:fuzztest",
+    "containersvectorcopytoarray_fuzzer:fuzztest",
     "containersvectorgetindexfrom_fuzzer:fuzztest",
     "containersvectorgetindexof_fuzzer:fuzztest",
     "containersvectorgetlastindexfrom_fuzzer:fuzztest",
     "containersvectorgetlastindexof_fuzzer:fuzztest",
     "containersvectorhas_fuzzer:fuzztest",
+    "containersvectorincreasecapacityto_fuzzer:fuzztest",
     "containersvectorinsert_fuzzer:fuzztest",
     "containersvectorremove_fuzzer:fuzztest",
     "containersvectorremovebyrange_fuzzer:fuzztest",
     "containersvectorset_fuzzer:fuzztest",
-    "containersvectorsubvector_fuzzer:fuzztest",
-    "containersvectorcopytoarray_fuzzer:fuzztest",
-    "containersvectorincreasecapacityto_fuzzer:fuzztest",
     "containersvectorsetlength_fuzzer:fuzztest",
+    "containersvectorsubvector_fuzzer:fuzztest",
     "copyableglobalisempty_fuzzer:fuzztest",
     "copyableglobalsetandclearweak_fuzzer:fuzztest",
     "createbigwords_fuzzer:fuzztest",
@@ -401,13 +403,13 @@ group("fuzztest") {
     "stringrefutf8length_fuzzer:fuzztest",
     "stringrefwritelatin1_fuzzer:fuzztest",
     "stringrefwriteutf16_fuzzer:fuzztest",
-    "stringtablespecialstringintern_fuzzer:fuzztest",
-    "stringtableutf8stringintern_fuzzer:fuzztest",
-    "stringtableutf16stringintern_fuzzer:fuzztest",
-    "stringtableloadstore_fuzzer:fuzztest",
     "stringtableconcatstringintern_fuzzer:fuzztest",
-    "stringtablehashcollision_fuzzer:fuzztest",
     "stringtableconcurrentloadstore_fuzzer:fuzztest",
+    "stringtablehashcollision_fuzzer:fuzztest",
+    "stringtableloadstore_fuzzer:fuzztest",
+    "stringtablespecialstringintern_fuzzer:fuzztest",
+    "stringtableutf16stringintern_fuzzer:fuzztest",
+    "stringtableutf8stringintern_fuzzer:fuzztest",
     "symbolnew_fuzzer:fuzztest",
     "symbolrefgetdescription_fuzzer:fuzztest",
     "tonativepointer_fuzzer:fuzztest",
@@ -418,7 +420,5 @@ group("fuzztest") {
     "uint8clampedarrayrefnew_fuzzer:fuzztest",
     "weakmapref_fuzzer:fuzztest",
     "weaksetref_fuzzer:fuzztest",
-    "commoncomplog_fuzzer:fuzztest",
-    "commoncompbaseutf_fuzzer:fuzztest",
   ]
 }
diff --git a/test/fuzztest/commoncomplog_fuzzer/BUILD.gn b/test/fuzztest/commoncomplog_fuzzer/BUILD.gn
index b8e75788f279696cb3c49b0cdfeb81bec53b7afa..61a988b30fad2298ef3e03e36d8ba4cceae1c189 100644
--- a/test/fuzztest/commoncomplog_fuzzer/BUILD.gn
+++ b/test/fuzztest/commoncomplog_fuzzer/BUILD.gn
@@ -17,8 +17,6 @@ import("//arkcompiler/ets_runtime/test/test_helper.gni")
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 
-
-
 ##################################fuzztest#####################################
 ohos_fuzztest("CommonCompLogFuzzTest") {
   module_out_path = ets_runtime_output_path
diff --git a/test/fuzztest/containersfastbuffercompare_fuzzer/BUILD.gn b/test/fuzztest/containersfastbuffercompare_fuzzer/BUILD.gn
index bc585cce2bbcaa64a751397b8cab6c1d519fe17e..a7ebe8f4727e34fbce36a20757b466ec176a7c3d 100644
--- a/test/fuzztest/containersfastbuffercompare_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersfastbuffercompare_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersFastBufferCompareFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersfastbuffercompare_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersfastbuffercompare_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersfastbufferequals_fuzzer/BUILD.gn b/test/fuzztest/containersfastbufferequals_fuzzer/BUILD.gn
index 9f9dd2b2798e5a48fb84a13abd4e184eab4afac4..711d42956966af98fc354acd3037968a2e45c779 100644
--- a/test/fuzztest/containersfastbufferequals_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersfastbufferequals_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersFastBufferEqualsFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersfastbufferequals_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersfastbufferequals_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersfastbufferindexof_fuzzer/BUILD.gn b/test/fuzztest/containersfastbufferindexof_fuzzer/BUILD.gn
index b491f2941b08b443f86d04fc94fee1c29d880d6a..0aad3bf979fc8999205c7526964b130cd8fa717a 100644
--- a/test/fuzztest/containersfastbufferindexof_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersfastbufferindexof_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersFastBufferIndexOfFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersfastbufferindexof_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersfastbufferindexof_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersfastbufferlastindexof_fuzzer/BUILD.gn b/test/fuzztest/containersfastbufferlastindexof_fuzzer/BUILD.gn
index c9b9de51f7e98c549c6c4edbb517f5a20058dc27..3cbe0fa0f4dad405ea3aa1a08cc32aaab02bf319 100644
--- a/test/fuzztest/containersfastbufferlastindexof_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersfastbufferlastindexof_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersFastBufferLastIndexOfFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersfastbufferlastindexof_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersfastbufferlastindexof_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersfastbuffertostring_fuzzer/BUILD.gn b/test/fuzztest/containersfastbuffertostring_fuzzer/BUILD.gn
index 438ad492e7546c3ab697ed35df75f2476d10e974..4e08cf6e706d0632ec481a790a27b71eb8d3d8c6 100644
--- a/test/fuzztest/containersfastbuffertostring_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersfastbuffertostring_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersFastBufferToStringFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersfastbuffertostring_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersfastbuffertostring_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersfastbufferwritereadvalue_fuzzer/BUILD.gn b/test/fuzztest/containersfastbufferwritereadvalue_fuzzer/BUILD.gn
index b8da3c2df900f97b2b6d0c842b9fc7f0487b7523..d0af8d59ddad4fa5436a4631cd5f8793ce51b99a 100644
--- a/test/fuzztest/containersfastbufferwritereadvalue_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersfastbufferwritereadvalue_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersFastBufferWriteReadValueFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersfastbufferwritereadvalue_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersfastbufferwritereadvalue_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarrayaddhas_fuzzer/BUILD.gn b/test/fuzztest/containersplainarrayaddhas_fuzzer/BUILD.gn
index a7ce806e6b6e275c5090d06c822ca0241ec708f6..b45cda65ae774ac775e8d461e74c64eb983d5b53 100644
--- a/test/fuzztest/containersplainarrayaddhas_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarrayaddhas_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArrayAddHasFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarrayaddhas_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarrayaddhas_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarraygetindexofkey_fuzzer/BUILD.gn b/test/fuzztest/containersplainarraygetindexofkey_fuzzer/BUILD.gn
index e3253e69afbc1f9666921c9b4f78ae0685b4fdc6..a9fec29ab1f232deed36e52f41cb9e186cd11cfe 100644
--- a/test/fuzztest/containersplainarraygetindexofkey_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarraygetindexofkey_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArrayGetIndexOfKeyFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraygetindexofkey_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraygetindexofkey_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarraygetindexofvalue_fuzzer/BUILD.gn b/test/fuzztest/containersplainarraygetindexofvalue_fuzzer/BUILD.gn
index 3ba176b4703cbed859efa28bf0dbb1a0c19f534a..63ca46257ee38552e580822dc841439c528f6b30 100644
--- a/test/fuzztest/containersplainarraygetindexofvalue_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarraygetindexofvalue_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArrayGetIndexOfValueFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraygetindexofvalue_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraygetindexofvalue_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarraygetkeyat_fuzzer/BUILD.gn b/test/fuzztest/containersplainarraygetkeyat_fuzzer/BUILD.gn
index e13063b93a3be170813785f02f4165bc1f622817..79bff5a2a1d965ded3db0403844b539a93bf8f06 100644
--- a/test/fuzztest/containersplainarraygetkeyat_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarraygetkeyat_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArrayGetKeyAtFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraygetkeyat_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraygetkeyat_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarraygetvalueat_fuzzer/BUILD.gn b/test/fuzztest/containersplainarraygetvalueat_fuzzer/BUILD.gn
index 79447a75da83db785d13618aeb25a9dfbb58572e..6cd90cd0958549da325e866100fb8ff2943cd7e6 100644
--- a/test/fuzztest/containersplainarraygetvalueat_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarraygetvalueat_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArrayGetValueAtFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraygetvalueat_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraygetvalueat_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarrayremove_fuzzer/BUILD.gn b/test/fuzztest/containersplainarrayremove_fuzzer/BUILD.gn
index e11bcc0149a594710f853f6e2dbd188d33147739..869b805804b3d1969bb9c41c89cb374e76bc8c30 100644
--- a/test/fuzztest/containersplainarrayremove_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarrayremove_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArrayRemoveFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarrayremove_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarrayremove_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarrayremoveat_fuzzer/BUILD.gn b/test/fuzztest/containersplainarrayremoveat_fuzzer/BUILD.gn
index cc358dc33267f96cf44cda15d2fa33c41f8650af..f30f5ad0eaa28a8f2f4c0e390534d17ad01cac3e 100644
--- a/test/fuzztest/containersplainarrayremoveat_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarrayremoveat_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArrayRemoveAtFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarrayremoveat_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarrayremoveat_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarrayremoverangefrom_fuzzer/BUILD.gn b/test/fuzztest/containersplainarrayremoverangefrom_fuzzer/BUILD.gn
index 329b78153305b5ecb0c92c325d177ffda5002ca3..6ddb4c93ca3adca61d33a04328c848fd35fe857b 100644
--- a/test/fuzztest/containersplainarrayremoverangefrom_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarrayremoverangefrom_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArrayRemoveRangeFromFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarrayremoverangefrom_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarrayremoverangefrom_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersplainarraysetvalueat_fuzzer/BUILD.gn b/test/fuzztest/containersplainarraysetvalueat_fuzzer/BUILD.gn
index 3ff04eff734ccbe5c74ad5d2c3c32fb4b2cc190f..3526a1c5c160f2a96f3ca80221840e1b9eed6d87 100644
--- a/test/fuzztest/containersplainarraysetvalueat_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersplainarraysetvalueat_fuzzer/BUILD.gn
@@ -21,8 +21,7 @@ import("//build/ohos.gni")
 ohos_fuzztest("ContainersPlainArraySetValueAtFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file =
-      "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraysetvalueat_fuzzer"
+  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/containersplainarraysetvalueat_fuzzer"
 
   resource_config_file =
       "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
diff --git a/test/fuzztest/containersvectorcopytoarray_fuzzer/BUILD.gn b/test/fuzztest/containersvectorcopytoarray_fuzzer/BUILD.gn
index b7022eabececb82a61edf8d7aa535844fe2d1872..f5531f665b6eab7926eea7cc89a95170acce3a15 100644
--- a/test/fuzztest/containersvectorcopytoarray_fuzzer/BUILD.gn
+++ b/test/fuzztest/containersvectorcopytoarray_fuzzer/BUILD.gn
@@ -39,4 +39,4 @@ group("fuzztest") {
   testonly = true
   deps = []
   deps += [ ":ContainersVectorCopyToArrayFuzzTest" ]
-}
\ No newline at end of file
+}
diff --git a/test/fuzztest/mergeapfiles_fuzzer/BUILD.gn b/test/fuzztest/mergeapfiles_fuzzer/BUILD.gn
index 07e5d2c3af02fec3c8faa7b0c5f0226d39c08646..43a60607e011c7f4f24736c8941d4b5f0bd79f1f 100644
--- a/test/fuzztest/mergeapfiles_fuzzer/BUILD.gn
+++ b/test/fuzztest/mergeapfiles_fuzzer/BUILD.gn
@@ -22,26 +22,23 @@ ohos_fuzztest("MergeApFilesFuzzTest") {
   module_out_path = ets_runtime_output_path
   fuzz_config_file = "$js_root/test/fuzztest/mergeapfiles_fuzzer"
   resource_config_file =
-  "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
+      "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
 
   include_dirs = []
-  sources = [
-  "mergeapfiles_fuzzer.cpp",
-  ]
-  configs = [ "$js_root:ecma_test_config"]
-  deps=["$js_root:libark_jsruntime_test" ]
+  sources = [ "mergeapfiles_fuzzer.cpp" ]
+  configs = [ "$js_root:ecma_test_config" ]
+  deps = [ "$js_root:libark_jsruntime_test" ]
 
   # hiviewdfx libraries
   external_deps = hiviewdfx_ext_deps
   external_deps += [ sdk_libc_secshared_dep ]
   deps += hiviewdfx_deps
 }
+
 ###############################################################################
 group("fuzztest") {
   testonly = true
   deps = []
-  deps += [
-    ":MergeApFilesFuzzTest",
-  ]
+  deps += [ ":MergeApFilesFuzzTest" ]
 }
 ###############################################################################
diff --git a/test/fuzztest/mergeapfilesformerger_fuzzer/BUILD.gn b/test/fuzztest/mergeapfilesformerger_fuzzer/BUILD.gn
index ffe7512844df24589bc0ba9d21d52d9c34d4995a..3c60936bb84c2b7571924e69d1013b3b3872dc0b 100644
--- a/test/fuzztest/mergeapfilesformerger_fuzzer/BUILD.gn
+++ b/test/fuzztest/mergeapfilesformerger_fuzzer/BUILD.gn
@@ -20,29 +20,32 @@ import("//build/test.gni")
 ##############################fuzztest##########################################
 ohos_fuzztest("MergeApFilesForMergerFuzzTest") {
   module_out_path = ets_runtime_output_path
-  fuzz_config_file = "//arkcompiler/ets_runtime/test/fuzztest/mergeapfilesformerger_fuzzer"
+  fuzz_config_file =
+      "//arkcompiler/ets_runtime/test/fuzztest/mergeapfilesformerger_fuzzer"
   resource_config_file =
-  "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
+      "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
 
   include_dirs = []
-  cflags = ["-g","-O0","-Wno-unused-variable","-fno-omit-frame-pointer"]
-  sources = [
-  "mergeapfilesformerger_fuzzer.cpp",
+  cflags = [
+    "-g",
+    "-O0",
+    "-Wno-unused-variable",
+    "-fno-omit-frame-pointer",
   ]
+  sources = [ "mergeapfilesformerger_fuzzer.cpp" ]
   configs = [ "//arkcompiler/ets_runtime:ecma_test_config" ]
   deps = [ "../../../:libark_jsruntime_test" ]
 
-    # hiviewdfx libraries
+  # hiviewdfx libraries
   external_deps = hiviewdfx_ext_deps
   external_deps += [ sdk_libc_secshared_dep ]
   deps += hiviewdfx_deps
 }
+
 ###############################################################################
 group("fuzztest") {
   testonly = true
   deps = []
-  deps += [
-    ":MergeApFilesForMergerFuzzTest",
-  ]
+  deps += [ ":MergeApFilesForMergerFuzzTest" ]
 }
 ###############################################################################
diff --git a/test/fuzztest/stringtableconcatstringintern_fuzzer/BUILD.gn b/test/fuzztest/stringtableconcatstringintern_fuzzer/BUILD.gn
index cbbfe006328891cc0466c4b73f5f8ef8eee541bf..0bfdc3ce1b339ec7c2385795e13d8602795d558b 100644
--- a/test/fuzztest/stringtableconcatstringintern_fuzzer/BUILD.gn
+++ b/test/fuzztest/stringtableconcatstringintern_fuzzer/BUILD.gn
@@ -21,7 +21,8 @@ import("//build/ohos.gni")
 ohos_fuzztest("StringTableConcatStringInternFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file = "$js_root/test/fuzztest/stringtableconcatstringintern_fuzzer"
+  fuzz_config_file =
+      "$js_root/test/fuzztest/stringtableconcatstringintern_fuzzer"
 
   resource_config_file = "$js_root/test/resource/js_runtime/ohos_test.xml"
 
diff --git a/test/fuzztest/stringtableconcurrentloadstore_fuzzer/BUILD.gn b/test/fuzztest/stringtableconcurrentloadstore_fuzzer/BUILD.gn
index 3ee3493ebc9054c310b61bbf6557caf09fe595f0..a704a827ccac47b0c3c01947a7b8a90ff660b35c 100644
--- a/test/fuzztest/stringtableconcurrentloadstore_fuzzer/BUILD.gn
+++ b/test/fuzztest/stringtableconcurrentloadstore_fuzzer/BUILD.gn
@@ -21,7 +21,8 @@ import("//build/ohos.gni")
 ohos_fuzztest("StringTableConcurrentLoadStoreFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file = "$js_root/test/fuzztest/stringtableconcurrentloadstore_fuzzer"
+  fuzz_config_file =
+      "$js_root/test/fuzztest/stringtableconcurrentloadstore_fuzzer"
 
   resource_config_file = "$js_root/test/resource/js_runtime/ohos_test.xml"
 
diff --git a/test/fuzztest/stringtablespecialstringintern_fuzzer/BUILD.gn b/test/fuzztest/stringtablespecialstringintern_fuzzer/BUILD.gn
index 0fef27c01be4842a73bcc46b7038b0b2f724fbb9..e972c7529783ac41dbbea6351a2d281eb6a0cc74 100644
--- a/test/fuzztest/stringtablespecialstringintern_fuzzer/BUILD.gn
+++ b/test/fuzztest/stringtablespecialstringintern_fuzzer/BUILD.gn
@@ -21,7 +21,8 @@ import("//build/ohos.gni")
 ohos_fuzztest("StringTableSpecialStringInternFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file = "$js_root/test/fuzztest/stringtablespecialstringintern_fuzzer"
+  fuzz_config_file =
+      "$js_root/test/fuzztest/stringtablespecialstringintern_fuzzer"
 
   resource_config_file = "$js_root/test/resource/js_runtime/ohos_test.xml"
 
diff --git a/test/fuzztest/stringtableutf16stringintern_fuzzer/BUILD.gn b/test/fuzztest/stringtableutf16stringintern_fuzzer/BUILD.gn
index 27ab708dee5a04e92fdd1e75f47a754e892a5382..f2d6e4b47e367dfe94635aaca61f934f32855e1a 100644
--- a/test/fuzztest/stringtableutf16stringintern_fuzzer/BUILD.gn
+++ b/test/fuzztest/stringtableutf16stringintern_fuzzer/BUILD.gn
@@ -21,7 +21,8 @@ import("//build/ohos.gni")
 ohos_fuzztest("StringTableUtf16StringInternFuzzTest") {
   module_out_path = ets_runtime_output_path
 
-  fuzz_config_file = "$js_root/test/fuzztest/stringtableutf16stringintern_fuzzer"
+  fuzz_config_file =
+      "$js_root/test/fuzztest/stringtableutf16stringintern_fuzzer"
 
   resource_config_file = "$js_root/test/resource/js_runtime/ohos_test.xml"
 
diff --git a/test/jittest/lazy_deopt_module_var/BUILD.gn b/test/jittest/lazy_deopt_module_var/BUILD.gn
index 41e0e2cc2fbb62e248b0fa0e6d21efc840720b0f..c426c602ee4339a236f953efbd2b519a6a9c2095 100644
--- a/test/jittest/lazy_deopt_module_var/BUILD.gn
+++ b/test/jittest/lazy_deopt_module_var/BUILD.gn
@@ -18,8 +18,6 @@ host_jit_test_action("A") {
 }
 
 host_jit_test_action("lazy_deopt_module_var") {
-  deps = [
-    ":gen_A_abc",
-  ]
+  deps = [ ":gen_A_abc" ]
   extra_option = "--log-info=trace --compiler-trace-deopt=true --compiler-enable-jit-lazy-deopt=true --compiler-enable-lazy-deopt-trace=true"
 }
diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn
index 40c51f208e8e4d8bcc1a3957101c7d97ae68c892..e071b0dd469e4fb3cfb34afa3925a08ddfa941a8 100644
--- a/test/moduletest/BUILD.gn
+++ b/test/moduletest/BUILD.gn
@@ -284,7 +284,7 @@ group("ark_js_assert_moduletest") {
   ]
 
   if (enable_next_optimization) {
-    assert_test_list += ["jsonstringifier_optimized"]
+    assert_test_list += [ "jsonstringifier_optimized" ]
   }
 
   deps = []
@@ -405,7 +405,7 @@ group("ark_asm_assert_test") {
   ]
 
   if (enable_next_optimization) {
-    assert_test_list += ["jsonstringifier_optimized"]
+    assert_test_list += [ "jsonstringifier_optimized" ]
   }
 
   deps = []
diff --git a/test/test_helper.gni b/test/test_helper.gni
index 57511a37010514622b1a06c5f07781e954caf5ae..a3a04c99c9dad71d73b6bd4077ce0d5c63d72e28 100644
--- a/test/test_helper.gni
+++ b/test/test_helper.gni
@@ -48,6 +48,7 @@ template("host_unittest_action") {
     if (!defined(external_deps)) {
       external_deps = []
     }
+
     # hiviewdfx libraries
     external_deps += hiviewdfx_ext_deps
     deps += hiviewdfx_deps
@@ -1383,7 +1384,6 @@ template("host_perf_test_action") {
   }
 }
 
-
 template("host_aot_js_test_action") {
   _target_name_ = "${target_name}"
   _deps_ = invoker.deps