modify code path

Signed-off-by: ry <ry.renyi@huawei.com>
This commit is contained in:
ry 2022-09-13 21:49:11 +08:00
parent ecd3d0647a
commit 6140b436c3
10 changed files with 25 additions and 24 deletions

View File

@ -17,20 +17,20 @@
"deps": {},
"build": {
"sub_component": [
"//test/developertest/examples/app_info:app_info",
"//test/developertest/examples/detector:detector",
"//test/developertest/examples/calculator:calculator",
"//test/developertest/examples/calculator:calculator_static"
"//test/testfwk/developer_test/examples/app_info:app_info",
"//test/testfwk/developer_test/examples/detector:detector",
"//test/testfwk/developer_test/examples/calculator:calculator",
"//test/testfwk/developer_test/examples/calculator:calculator_static"
],
"inner_kits": [],
"test": [
"//test/developertest/examples/app_info/test:unittest",
"//test/developertest/examples/calculator/test:unittest",
"//test/developertest/examples/calculator/test:fuzztest",
"//test/developertest/examples/calculator/test:benchmarktest",
"//test/developertest/examples/detector/test:unittest",
"//test/developertest/examples/sleep/test:performance",
"//test/developertest/examples/distributedb/test:distributedtest"
"//test/testfwk/developer_test/examples/app_info/test:unittest",
"//test/testfwk/developer_test/examples/calculator/test:unittest",
"//test/testfwk/developer_test/examples/calculator/test:fuzztest",
"//test/testfwk/developer_test/examples/calculator/test:benchmarktest",
"//test/testfwk/developer_test/examples/detector/test:unittest",
"//test/testfwk/developer_test/examples/sleep/test:performance",
"//test/testfwk/developer_test/examples/distributedb/test:distributedtest"
]
}
}

View File

@ -19,7 +19,7 @@ ohos_js_unittest("GetAppInfoJsTest") {
module_out_path = module_output_path
hap_profile = "./config.json"
certificate_profile = "//test/developertest/signature/openharmony_sx.p7b"
certificate_profile = "//test/testfwk/developer_test/signature/openharmony_sx.p7b"
}
group("unittest") {

View File

@ -31,7 +31,7 @@ ohos_unittest("DetectorDependTest") {
configs = [ ":module_private_config" ]
deps = [
"//test/developertest/examples/detector:detector",
"//test/testfwk/developer_test/examples/detector:detector",
"//third_party/googletest:gtest_main",
]
}

View File

@ -26,7 +26,7 @@ config("module_private_config") {
"//foundation/distributeddatamgr/kv_store/interfaces/innerkits/app_distributeddata/include",
"//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include",
"//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/app/include",
"//test/developertest/aw/distributed",
"//test/testfwk/developer_test/aw/distributed",
]
# link library
@ -39,7 +39,7 @@ config("module_private_config") {
ohos_distributedtest("DistributeDemo") {
module_out_path = module_output_path
sources = [ "//test/developertest/examples/distributedb/test/distributedtest/common/distribute_demo.cpp" ]
sources = [ "//test/testfwk/developer_test/examples/distributedb/test/distributedtest/common/distribute_demo.cpp" ]
configs = [ ":module_private_config" ]
@ -61,7 +61,7 @@ ohos_distributedtest("DistributeDemo") {
ohos_distributedtest("DistributeDemoAgent") {
module_out_path = module_output_path
sources = [ "//test/developertest/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp" ]
sources = [ "//test/testfwk/developer_test/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp" ]
configs = [ ":module_private_config" ]

View File

@ -13,5 +13,5 @@
source_set("calc_multi_demo") {
sources = [ "calc_multi.c" ]
include_dirs = [ "//test/developertest/example/c_demo/include" ]
include_dirs = [ "//test/testfwk/developer_test/example/c_demo/include" ]
}

View File

@ -14,10 +14,10 @@
import("//build/lite/config/test.gni")
unittest("CalcMultiTest") {
include_dirs = [ "//test/developertest/example/c_demo/include" ]
include_dirs = [ "//test/testfwk/developer_test/example/c_demo/include" ]
sources = [ "calc_multi_test.c" ]
configs = []
deps = [ "//test/developertest/example/c_demo/source:calc_multi_demo" ]
deps = [ "//test/testfwk/developer_test/example/c_demo/source:calc_multi_demo" ]
}
###############################################################################

View File

@ -33,7 +33,7 @@ ohos_performancetest("SpentTimeTest") {
configs = [ ":module_private_config" ]
deps = [
"//test/developertest/aw/cxx/hwext:performance_test_static",
"//test/testfwk/developer_test/aw/cxx/hwext:performance_test_static",
"//third_party/googletest:gtest_main",
]
}

View File

@ -48,7 +48,7 @@ SOURCE_OUT_DIR = os.path.join(SOURCE_ROOT_DIR, "out")
TDD_BUILD_GN_PATH = os.path.join(
SOURCE_ROOT_DIR,
"test/developertest/BUILD.gn"
"test/testfwk/developer_test/BUILD.gn"
)
###project name must end with _fuzzer. eg. my_fuzzer,extrator_fuzzer.
VALID_PROJECT_NAME_REGEX = re.compile(r'^[a-zA-Z0-9_-]+(_fuzzer)+$')

View File

@ -121,10 +121,11 @@ class BuildManager(object):
LOG.warning("No build target found.")
return False
# 路径拼接 build_cfg_filepath = OpenHarmony/test/developertest/BUILD.gn
# 路径拼接 build_cfg_filepath = OpenHarmony/test/testfwk/developer_test/BUILD.gn
build_cfg_filepath = os.path.join(project_root_path,
"test",
"developertest",
"testfwk",
"developer_test",
"BUILD.gn")
self._make_gn_file(build_cfg_filepath, target_list)

View File

@ -104,7 +104,7 @@ ohos_js_unittest("%(suite_name)s") {
":%(suite_name)s_resources",
]
certificate_profile = "//test/developertest/signature/openharmony_sx.p7b"
certificate_profile = "//test/testfwk/developer_test/signature/openharmony_sx.p7b"
hap_name = "%(suite_name)s"
}
ohos_js_assets("%(suite_name)s_js_assets") {