diff --git a/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn b/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn
index 6bb96ed899076b316125aa142bb07d6800c815d5..c2f5cb7583fcc6ab84336e2d3ed416032aa5eabe 100644
--- a/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn
+++ b/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn
@@ -30,9 +30,10 @@ ohos_js_hap_suite("ActsHiAppeventTest") {
   #  subsystem_name = "xts"
 }
 ohos_js_assets("hiappevent_js_assets") {
-  js2abc=true
+  js2abc = true
   hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"}
+  source_dir = "./src/main/js"
+}
 ohos_resources("hiappevent_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/BUILD.gn b/hiviewdfx/hicheckertest/hicheckerjstest/BUILD.gn
index a3a0e292bdd6e4f5ce33affc03f03fe073925b66..58904c8e4cac55d1e40241dcb5c2e7b8b4b1ba40 100644
--- a/hiviewdfx/hicheckertest/hicheckerjstest/BUILD.gn
+++ b/hiviewdfx/hicheckertest/hicheckerjstest/BUILD.gn
@@ -30,9 +30,10 @@ ohos_js_hap_suite("hicheckerjstest") {
   #  subsystem_name = "xts"
 }
 ohos_js_assets("hichecker_js_assets") {
-  js2abc=true
+  js2abc = true
   hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"}
+  source_dir = "./src/main/js"
+}
 ohos_resources("hichecker_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
diff --git a/hiviewdfx/hidebugtest/hidebugtestjstest/BUILD.gn b/hiviewdfx/hidebugtest/hidebugtestjstest/BUILD.gn
index c94ef5b888c89243366f91d960f7ca3c998d5aaf..e208094c713e603347d3f9533c17998cf80fde3b 100644
--- a/hiviewdfx/hidebugtest/hidebugtestjstest/BUILD.gn
+++ b/hiviewdfx/hidebugtest/hidebugtestjstest/BUILD.gn
@@ -19,14 +19,16 @@ ohos_js_hap_suite("ActsHiDebugTest") {
     ":hidebug_js_assets",
     ":hidebug_js_resources",
   ]
+
   #ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsHiDebugTest"
 }
 ohos_js_assets("hidebug_js_assets") {
-  js2abc=true
+  js2abc = true
   hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"}
+  source_dir = "./src/main/js"
+}
 ohos_resources("hidebug_js_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
diff --git a/hiviewdfx/hidebugtest/hidebugtestjstest/Test.json b/hiviewdfx/hidebugtest/hidebugtestjstest/Test.json
index c26c060e07e011497dd44df3fa94af7ef7c5ccb2..794ca3c385167491b6202f53f86211d1dbc7bb4d 100644
--- a/hiviewdfx/hidebugtest/hidebugtestjstest/Test.json
+++ b/hiviewdfx/hidebugtest/hidebugtestjstest/Test.json
@@ -3,7 +3,7 @@
     "driver": {
         "type": "OHJSUnitTest",
         "test-timeout": "1800000",
-        "shell-timeout": "1800000",
+        "shell-timeout": "60000",
         "bundle-name": "com.hidebug.test",
         "package-name": "com.hidebug.test"
     },
diff --git a/hiviewdfx/hilogtest/hilogjstest/BUILD.gn b/hiviewdfx/hilogtest/hilogjstest/BUILD.gn
index 8c107da701cde86d6782b31216f13b5d4a4b2ecf..cbe588eb17ebe372f42600542540c3d3c9e42838 100755
--- a/hiviewdfx/hilogtest/hilogjstest/BUILD.gn
+++ b/hiviewdfx/hilogtest/hilogjstest/BUILD.gn
@@ -23,9 +23,10 @@ ohos_js_hap_suite("ActsHilogJsTest") {
   hap_name = "ActsHilogJsTest"
 }
 ohos_js_assets("hilog_js_assets") {
-  js2abc=true
+  js2abc = true
   hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"}
+  source_dir = "./src/main/js"
+}
 ohos_resources("hilog_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
diff --git a/hiviewdfx/hilogtest/hilogjstest/Test.json b/hiviewdfx/hilogtest/hilogjstest/Test.json
index ae7d1b5ca1f9351b589eb837742232958eeb268c..251e480db1f6c7c560399f12c24fbb1e1bd45132 100755
--- a/hiviewdfx/hilogtest/hilogjstest/Test.json
+++ b/hiviewdfx/hilogtest/hilogjstest/Test.json
@@ -3,7 +3,7 @@
     "driver": {
         "type": "OHJSUnitTest",
         "test-timeout": "270000",
-        "shell-timeout": "270000",
+        "shell-timeout": "60000",
         "bundle-name": "ohos.acts.hiviewdfx.hilog.function",
         "package-name": "ohos.acts.hiviewdfx.hilog.function"
     },
diff --git a/hiviewdfx/hilogtest/hilogndktest/BUILD.gn b/hiviewdfx/hilogtest/hilogndktest/BUILD.gn
index 6ad1ed6f71306522002e410831748d04bf8c7bb8..3ee553eaf3edef7672b50b505b1ed23d15077318 100755
--- a/hiviewdfx/hilogtest/hilogndktest/BUILD.gn
+++ b/hiviewdfx/hilogtest/hilogndktest/BUILD.gn
@@ -27,8 +27,8 @@ ohos_moduletest_suite("hilogndktest") {
   deps = [
     "//base/hiviewdfx/hilog/frameworks/hilog_ndk:hilog_ndk",
     "//base/hiviewdfx/hilog/interfaces/native/kits:libhilog_ndk",
-    "//utils/native/base:utils",
     "//third_party/googletest:gtest_main",
+    "//utils/native/base:utils",
   ]
   configs = [ ":hilogndktest_config" ]
 }
diff --git a/hiviewdfx/hisyseventtest/hisyseventjstest/BUILD.gn b/hiviewdfx/hisyseventtest/hisyseventjstest/BUILD.gn
index 0bfd04e355d8540ca92964914038bdf8638c5f49..bc83d293ea8a69350ab63c61b2e8c8f0a54c7000 100755
--- a/hiviewdfx/hisyseventtest/hisyseventjstest/BUILD.gn
+++ b/hiviewdfx/hisyseventtest/hisyseventjstest/BUILD.gn
@@ -30,9 +30,10 @@ ohos_js_hap_suite("ActsHiSysEventJsTest") {
   #  subsystem_name = "xts"
 }
 ohos_js_assets("hisysevent_js_assets") {
-  js2abc=true
+  js2abc = true
   hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"}
+  source_dir = "./src/main/js"
+}
 ohos_resources("hisysevent_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
diff --git a/hiviewdfx/hitracechainjstest/BUILD.gn b/hiviewdfx/hitracechainjstest/BUILD.gn
index 83f9b5a87083f26b11b6ec89f2ceead87c3bb96c..d50b4f610d854a15db58059edbe38f690cb068f9 100755
--- a/hiviewdfx/hitracechainjstest/BUILD.gn
+++ b/hiviewdfx/hitracechainjstest/BUILD.gn
@@ -23,9 +23,10 @@ ohos_js_hap_suite("ActsHiTraceChainJsTest") {
   hap_name = "ActsHiTraceChainJsTest"
 }
 ohos_js_assets("hitrace_js_assets") {
-  js2abc=true
+  js2abc = true
   hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"}
+  source_dir = "./src/main/js"
+}
 ohos_resources("hitrace_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"