From 5da5cc6a71859a3697acebbf6f5f5afd06f30370 Mon Sep 17 00:00:00 2001 From: jiyong_sd Date: Mon, 18 Jul 2022 15:02:06 +0800 Subject: [PATCH] modified FA-JS Signed-off-by: jiyong_sd --- hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn | 5 +++-- hiviewdfx/hicheckertest/hicheckerjstest/BUILD.gn | 5 +++-- hiviewdfx/hidebugtest/hidebugtestjstest/BUILD.gn | 6 ++++-- hiviewdfx/hidebugtest/hidebugtestjstest/Test.json | 2 +- hiviewdfx/hilogtest/hilogjstest/BUILD.gn | 5 +++-- hiviewdfx/hilogtest/hilogjstest/Test.json | 2 +- hiviewdfx/hilogtest/hilogndktest/BUILD.gn | 2 +- hiviewdfx/hisyseventtest/hisyseventjstest/BUILD.gn | 5 +++-- hiviewdfx/hitracechainjstest/BUILD.gn | 5 +++-- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn b/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn index 6bb96ed89..c2f5cb758 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 a3a0e292b..58904c8e4 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 c94ef5b88..e208094c7 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 c26c060e0..794ca3c38 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 8c107da70..cbe588eb1 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 ae7d1b5ca..251e480db 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 6ad1ed6f7..3ee553eaf 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 0bfd04e35..bc83d293e 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 83f9b5a87..d50b4f610 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" -- GitLab