From 36794531531907831b80f1983e1042819a8ef5a5 Mon Sep 17 00:00:00 2001 From: renxiang Date: Tue, 12 Oct 2021 19:47:43 +0800 Subject: [PATCH 1/2] modify test subsystem name to developertest Signed-off-by: renxiang --- README_zh.md | 8 ++++---- examples/BUILD.gn | 2 +- examples/app_info/BUILD.gn | 2 +- .../app_info/test/unittest/common/get_app_info/BUILD.gn | 2 +- examples/calculator/BUILD.gn | 2 +- .../calculator/test/fuzztest/common/parse_fuzzer/BUILD.gn | 2 +- examples/calculator/test/unittest/common/BUILD.gn | 2 +- examples/calculator/test/unittest/phone/BUILD.gn | 2 +- examples/detector/BUILD.gn | 2 +- examples/detector/test/unittest/common/BUILD.gn | 2 +- examples/distributedb/test/BUILD.gn | 2 +- examples/sleep/test/performance/common/BUILD.gn | 2 +- libs/fuzzlib/README_zh.md | 2 +- examples/ohos.build => ohos.build | 4 ++-- 14 files changed, 18 insertions(+), 18 deletions(-) rename examples/ohos.build => ohos.build (91%) mode change 100755 => 100644 diff --git a/README_zh.md b/README_zh.md index 6627922..37cb7e5 100755 --- a/README_zh.md +++ b/README_zh.md @@ -379,7 +379,7 @@ subsystem # 子系统 import("//build/test.gni") - module_output_path = "subsystem_examples/calculator" + module_output_path = "developertest/calculator" config("module_private_config") { visibility = [ ":*" ] @@ -419,7 +419,7 @@ subsystem # 子系统 ``` 3. 指定文件输出路径 ``` - module_output_path = "subsystem_examples/calculator" + module_output_path = "developertest/calculator" ``` > **说明：** 此处输出路径为部件/模块名。 @@ -481,7 +481,7 @@ subsystem # 子系统 import("//build/test.gni") - module_output_path = "subsystem_examples/app_info" + module_output_path = "developertest/app_info" ohos_js_unittest("GetAppInfoJsTest") { module_out_path = module_output_path @@ -511,7 +511,7 @@ subsystem # 子系统 3. 指定文件输出路径 ``` - module_output_path = "subsystem_examples/app_info" + module_output_path = "developertest/app_info" ``` > **说明：** 此处输出路径为部件/模块名。 diff --git a/examples/BUILD.gn b/examples/BUILD.gn index d1e0649..1c255b8 100755 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") -ohos_subsystem("subsystem_examples") { +ohos_subsystem("developertest") { subsystem_packages = [ "calculator:calculator", "detector:detector", diff --git a/examples/app_info/BUILD.gn b/examples/app_info/BUILD.gn index f19459b..72593f1 100644 --- a/examples/app_info/BUILD.gn +++ b/examples/app_info/BUILD.gn @@ -22,6 +22,6 @@ config("app_info_config") { ohos_shared_library("app_info") { sources = [] public_configs = [ ":app_info_config" ] - subsystem_name = "subsystem_examples" + subsystem_name = "developertest" } ############################################################################### diff --git a/examples/app_info/test/unittest/common/get_app_info/BUILD.gn b/examples/app_info/test/unittest/common/get_app_info/BUILD.gn index 2b4c186..3965ed3 100644 --- a/examples/app_info/test/unittest/common/get_app_info/BUILD.gn +++ b/examples/app_info/test/unittest/common/get_app_info/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "subsystem_examples/app_info" +module_output_path = "developertest/app_info" ohos_js_unittest("GetAppInfoJsTest") { module_out_path = module_output_path diff --git a/examples/calculator/BUILD.gn b/examples/calculator/BUILD.gn index 56c97c9..aede5d5 100755 --- a/examples/calculator/BUILD.gn +++ b/examples/calculator/BUILD.gn @@ -25,7 +25,7 @@ ohos_shared_library("calculator") { "src/calculator.cpp", ] public_configs = [ ":calculator_config" ] - subsystem_name = "subsystem_examples" + subsystem_name = "developertest" } ohos_static_library("calculator_static") { diff --git a/examples/calculator/test/fuzztest/common/parse_fuzzer/BUILD.gn b/examples/calculator/test/fuzztest/common/parse_fuzzer/BUILD.gn index 8072e7d..bfdc220 100644 --- a/examples/calculator/test/fuzztest/common/parse_fuzzer/BUILD.gn +++ b/examples/calculator/test/fuzztest/common/parse_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/features.gni") import("//build/test.gni") -module_output_path = "subsystem_examples/calculator" +module_output_path = "developertest/calculator" ##############################fuzztest########################################## ohos_fuzztest("CalculatorFuzzTest") { diff --git a/examples/calculator/test/unittest/common/BUILD.gn b/examples/calculator/test/unittest/common/BUILD.gn index 6c566cf..676bfbd 100755 --- a/examples/calculator/test/unittest/common/BUILD.gn +++ b/examples/calculator/test/unittest/common/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "subsystem_examples/calculator" +module_output_path = "developertest/calculator" ############################################################################### config("module_private_config") { diff --git a/examples/calculator/test/unittest/phone/BUILD.gn b/examples/calculator/test/unittest/phone/BUILD.gn index 75fcca7..3191954 100755 --- a/examples/calculator/test/unittest/phone/BUILD.gn +++ b/examples/calculator/test/unittest/phone/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "subsystem_examples/calculator" +module_output_path = "developertest/calculator" ############################################################################### config("module_private_config") { diff --git a/examples/detector/BUILD.gn b/examples/detector/BUILD.gn index f1c5527..1254fc3 100755 --- a/examples/detector/BUILD.gn +++ b/examples/detector/BUILD.gn @@ -28,6 +28,6 @@ ohos_shared_library("detector") { "src/detector.cpp", ] configs = [ ":detector_config" ] - subsystem_name = "subsystem_examples" + subsystem_name = "developertest" } ############################################################################### diff --git a/examples/detector/test/unittest/common/BUILD.gn b/examples/detector/test/unittest/common/BUILD.gn index 2f155ef..7a30719 100755 --- a/examples/detector/test/unittest/common/BUILD.gn +++ b/examples/detector/test/unittest/common/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "subsystem_examples/detector" +module_output_path = "developertest/detector" ############################################################################### config("module_private_config") { diff --git a/examples/distributedb/test/BUILD.gn b/examples/distributedb/test/BUILD.gn index b3347fc..49e1bcb 100755 --- a/examples/distributedb/test/BUILD.gn +++ b/examples/distributedb/test/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "subsystem_examples/distributedb" +module_output_path = "developertest/distributedb" ############################################################################### config("module_private_config") { diff --git a/examples/sleep/test/performance/common/BUILD.gn b/examples/sleep/test/performance/common/BUILD.gn index abb9802..163912b 100755 --- a/examples/sleep/test/performance/common/BUILD.gn +++ b/examples/sleep/test/performance/common/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -module_output_path = "subsystem_examples/sleep" +module_output_path = "developertest/sleep" ############################################################################### config("module_private_config") { diff --git a/libs/fuzzlib/README_zh.md b/libs/fuzzlib/README_zh.md index 5759221..b4ca911 100644 --- a/libs/fuzzlib/README_zh.md +++ b/libs/fuzzlib/README_zh.md @@ -220,7 +220,7 @@ Fuzzing测试框架使用了LLVM编译器框架中的[libFuzzer](https://llvm.or Fuzz能力集成，在测试类型-t中新增FUZZ类型，执行Fuzz测试指令示例，其中-t为必选，-ss和-tm为可选 ``` -run -t FUZZ -ss subsystem_examples -tm calculator +run -t FUZZ -ss developertest -tm calculator ``` | 参数 | 描述 | 说明 | 备注 | diff --git a/examples/ohos.build b/ohos.build old mode 100755 new mode 100644 similarity index 91% rename from examples/ohos.build rename to ohos.build index 8bea016..5779bd1 --- a/examples/ohos.build +++ b/ohos.build @@ -1,7 +1,7 @@ { - "subsystem": "subsystem_examples", + "subsystem": "developertest", "parts": { - "subsystem_examples": { + "developertest": { "module_list": [ "//test/developertest/examples/app_info:app_info", "//test/developertest/examples/detector:detector", -- Gitee From 4bad55dac14c24c8fb1602402998f50aca0238b3 Mon Sep 17 00:00:00 2001 From: NicoYam Date: Tue, 12 Oct 2021 12:29:02 +0000 Subject: [PATCH 2/2] modify test subsystem name to developertest Signed-off-by: renxiang --- examples/distributedb/test/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/distributedb/test/BUILD.gn b/examples/distributedb/test/BUILD.gn index 49e1bcb..19e1164 100755 --- a/examples/distributedb/test/BUILD.gn +++ b/examples/distributedb/test/BUILD.gn @@ -33,9 +33,7 @@ config("module_private_config") { #ldflags = [ "-llog" ] # library path - lib_dirs = [ - "//foundation/appexecfwk/libs", - ] + lib_dirs = [ "//foundation/appexecfwk/libs" ] } ohos_distributedtest("DistributeDemo") { -- Gitee