From 2a1da32703c7ff551c5e24b9079a07be352ce3a3 Mon Sep 17 00:00:00 2001 From: mamingshuai Date: Tue, 21 Jun 2022 17:10:06 +0800 Subject: [PATCH] init weekly_20220621 Signed-off-by: mamingshuai --- README.md | 6 +-- chipsets/all.xml | 2 +- chipsets/bearpi_hm_micro.xml | 2 +- chipsets/bearpi_hm_micro/bearpi_hm_micro.xml | 2 +- chipsets/bearpi_hm_nano.xml | 2 +- chipsets/cst85_wblink.xml | 2 +- chipsets/cst85_wblink/cst85_wblink.xml | 2 +- chipsets/dayu200.xml | 2 +- chipsets/dayu200/dayu200.xml | 2 +- chipsets/dev_wifi_a.xml | 2 +- chipsets/dev_wifi_a/dev_wifi_a.xml | 2 +- chipsets/evb_oh1.xml | 2 +- chipsets/evb_oh1/evb_oh1.xml | 2 +- chipsets/gr5515_sk.xml | 2 +- chipsets/gr5515_sk/gr5515_sk.xml | 2 +- chipsets/hispark/hispark.xml | 2 +- chipsets/hispark_aries.xml | 2 +- chipsets/hispark_pegasus.xml | 2 +- chipsets/hispark_taurus.xml | 2 +- chipsets/neptune100.xml | 2 +- chipsets/neptune100/neptune100.xml | 2 +- chipsets/niobe407.xml | 2 +- chipsets/niobe407/niobe407.xml | 2 +- chipsets/qemu.xml | 2 +- chipsets/qemu/qemu.xml | 2 +- chipsets/v200zr.xml | 2 +- chipsets/v200zr/v200zr.xml | 2 +- default.xml | 2 +- devboard.xml | 32 +++++++-------- matrix_product.csv | 42 ++++++++++---------- ohos/ohos.xml | 24 +++++------ 31 files changed, 78 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 92a9bac..cf50372 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ manifest -## 3. [matrix_product.csv文件](https://gitee.com/openharmony/manifest/blob/master/matrix_product.csv)说明 -matrix_product.csv用于管理OpenHarmony代码仓对应的编译形态，以及每个设备形态下面对应的测试用例。 +## 3. matrix_product.csv文件说明 +[matrix_product.csv](https://gitee.com/openharmony/manifest/blob/master/matrix_product.csv)用于管理OpenHarmony代码仓对应的编译形态，以及每个设备形态下面对应的测试用例。 ## 修改/新增代码仓 @@ -99,4 +99,4 @@ A,B两列分别填入对应的仓名和组件名，C列往后是编译形态和 3、组件依赖关系由责任田维护，不提供依赖关系的只测试当前组件，提供依赖关系会解析三层组件的总测试用例集用于门禁测试。 ## 验证方法 -评论start build是否可以正常触发门禁，如提示默认不跑门禁，则需填写matrix_product.csv。 +评论start build是否可以正常触发门禁，如提示默认不跑门禁，则需填写[matrix_product.csv](https://gitee.com/openharmony/manifest/blob/master/matrix_product.csv)。 diff --git a/chipsets/all.xml b/chipsets/all.xml index c9cb420..dcf5d8d 100755 --- a/chipsets/all.xml +++ b/chipsets/all.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/bearpi_hm_micro.xml b/chipsets/bearpi_hm_micro.xml index 69c3c32..995b39b 100755 --- a/chipsets/bearpi_hm_micro.xml +++ b/chipsets/bearpi_hm_micro.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/bearpi_hm_micro/bearpi_hm_micro.xml b/chipsets/bearpi_hm_micro/bearpi_hm_micro.xml index 8be5042..338146c 100755 --- a/chipsets/bearpi_hm_micro/bearpi_hm_micro.xml +++ b/chipsets/bearpi_hm_micro/bearpi_hm_micro.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/bearpi_hm_nano.xml b/chipsets/bearpi_hm_nano.xml index 77ef648..0f49f8e 100755 --- a/chipsets/bearpi_hm_nano.xml +++ b/chipsets/bearpi_hm_nano.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/cst85_wblink.xml b/chipsets/cst85_wblink.xml index 41ca567..3f25110 100755 --- a/chipsets/cst85_wblink.xml +++ b/chipsets/cst85_wblink.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/cst85_wblink/cst85_wblink.xml b/chipsets/cst85_wblink/cst85_wblink.xml index 3250bf4..c5d9f8b 100755 --- a/chipsets/cst85_wblink/cst85_wblink.xml +++ b/chipsets/cst85_wblink/cst85_wblink.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/dayu200.xml b/chipsets/dayu200.xml index 8b9d1f5..4293717 100755 --- a/chipsets/dayu200.xml +++ b/chipsets/dayu200.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/dayu200/dayu200.xml b/chipsets/dayu200/dayu200.xml index e977025..b2b6a9f 100755 --- a/chipsets/dayu200/dayu200.xml +++ b/chipsets/dayu200/dayu200.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/dev_wifi_a.xml b/chipsets/dev_wifi_a.xml index 0317f9b..2cb8c20 100755 --- a/chipsets/dev_wifi_a.xml +++ b/chipsets/dev_wifi_a.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/dev_wifi_a/dev_wifi_a.xml b/chipsets/dev_wifi_a/dev_wifi_a.xml index 29a2607..cd563c0 100755 --- a/chipsets/dev_wifi_a/dev_wifi_a.xml +++ b/chipsets/dev_wifi_a/dev_wifi_a.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/evb_oh1.xml b/chipsets/evb_oh1.xml index 5659f37..5303e22 100755 --- a/chipsets/evb_oh1.xml +++ b/chipsets/evb_oh1.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/evb_oh1/evb_oh1.xml b/chipsets/evb_oh1/evb_oh1.xml index 3a64c0d..ecb78d6 100755 --- a/chipsets/evb_oh1/evb_oh1.xml +++ b/chipsets/evb_oh1/evb_oh1.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/gr5515_sk.xml b/chipsets/gr5515_sk.xml index 69546d1..b717e7e 100755 --- a/chipsets/gr5515_sk.xml +++ b/chipsets/gr5515_sk.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/gr5515_sk/gr5515_sk.xml b/chipsets/gr5515_sk/gr5515_sk.xml index 95e0a20..1f26b80 100755 --- a/chipsets/gr5515_sk/gr5515_sk.xml +++ b/chipsets/gr5515_sk/gr5515_sk.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/hispark/hispark.xml b/chipsets/hispark/hispark.xml index 4a9d0e8..d8de4f1 100755 --- a/chipsets/hispark/hispark.xml +++ b/chipsets/hispark/hispark.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/hispark_aries.xml b/chipsets/hispark_aries.xml index 73201f3..eb780fa 100755 --- a/chipsets/hispark_aries.xml +++ b/chipsets/hispark_aries.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/hispark_pegasus.xml b/chipsets/hispark_pegasus.xml index 73201f3..eb780fa 100755 --- a/chipsets/hispark_pegasus.xml +++ b/chipsets/hispark_pegasus.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/hispark_taurus.xml b/chipsets/hispark_taurus.xml index 73201f3..eb780fa 100755 --- a/chipsets/hispark_taurus.xml +++ b/chipsets/hispark_taurus.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/neptune100.xml b/chipsets/neptune100.xml index 54217ef..3667973 100755 --- a/chipsets/neptune100.xml +++ b/chipsets/neptune100.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/neptune100/neptune100.xml b/chipsets/neptune100/neptune100.xml index 7d03f1a..eb73708 100755 --- a/chipsets/neptune100/neptune100.xml +++ b/chipsets/neptune100/neptune100.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/niobe407.xml b/chipsets/niobe407.xml index 4097147..82d4c41 100755 --- a/chipsets/niobe407.xml +++ b/chipsets/niobe407.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/niobe407/niobe407.xml b/chipsets/niobe407/niobe407.xml index 1162b76..0f02be2 100755 --- a/chipsets/niobe407/niobe407.xml +++ b/chipsets/niobe407/niobe407.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/qemu.xml b/chipsets/qemu.xml index 036ad62..52e56e6 100755 --- a/chipsets/qemu.xml +++ b/chipsets/qemu.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/qemu/qemu.xml b/chipsets/qemu/qemu.xml index 09a2bcc..b2f6a7d 100755 --- a/chipsets/qemu/qemu.xml +++ b/chipsets/qemu/qemu.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/v200zr.xml b/chipsets/v200zr.xml index 5a409b3..351e101 100755 --- a/chipsets/v200zr.xml +++ b/chipsets/v200zr.xml @@ -1,7 +1,7 @@ - + diff --git a/chipsets/v200zr/v200zr.xml b/chipsets/v200zr/v200zr.xml index cace4a7..70e44bf 100755 --- a/chipsets/v200zr/v200zr.xml +++ b/chipsets/v200zr/v200zr.xml @@ -1,7 +1,7 @@ - + diff --git a/default.xml b/default.xml index 8154f40..24ef2ad 100755 --- a/default.xml +++ b/default.xml @@ -1,7 +1,7 @@ - + diff --git a/devboard.xml b/devboard.xml index 9a1b786..2b577a9 100644 --- a/devboard.xml +++ b/devboard.xml @@ -2,21 +2,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/matrix_product.csv b/matrix_product.csv index 36bf89d..f1c7323 100644 --- a/matrix_product.csv +++ b/matrix_product.csv @@ -8,11 +8,7 @@ ability_scheduler_stub_test ability_token_proxy_test ability_token_stub_test app_scheduler_test -lifecycle_deal_test -want_receiver_proxy_test -want_receiver_stub_test -want_sender_proxy_test -want_sender_stub_test","ability_manager_proxy_test +lifecycle_deal_test","ability_manager_proxy_test ability_manager_stub_test ability_record_test ability_scheduler_proxy_test @@ -20,11 +16,7 @@ ability_scheduler_stub_test ability_token_proxy_test ability_token_stub_test app_scheduler_test -lifecycle_deal_test -want_receiver_proxy_test -want_receiver_stub_test -want_sender_proxy_test -want_sender_stub_test","ability_manager_proxy_test +lifecycle_deal_test","ability_manager_proxy_test ability_manager_stub_test ability_record_test ability_scheduler_proxy_test @@ -32,11 +24,19 @@ ability_scheduler_stub_test ability_token_proxy_test ability_token_stub_test app_scheduler_test -lifecycle_deal_test -want_receiver_proxy_test +lifecycle_deal_test" +ability_ability_base,@ohos/ability_ability_base,N,N,N,N,N,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,Y,N,N,,,,"want_receiver_proxy_test +want_receiver_stub_test +want_sender_proxy_test +want_sender_stub_test","want_receiver_proxy_test +want_receiver_stub_test +want_sender_proxy_test +want_sender_stub_test","want_receiver_proxy_test want_receiver_stub_test want_sender_proxy_test want_sender_stub_test" +ability_form_fwk,@ohos/ability_form_fwk,N,N,N,N,N,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,Y,N,N,,,,EventLogTest,EventLogTest,EventLogTest +ability_idl_tool,@ohos/ability_idl_tool,N,N,N,N,N,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,Y,N,N,,,,EventLogTest,EventLogTest,EventLogTest account_os_account,@ohos/account_os_account,N,N,N,N,N,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,Y,N,N,,,,"account_mgr_test AccountSALogTest AccountSAPerfTest @@ -128,7 +128,7 @@ deviceauth_llt","EventLogTest deviceauth_llt","EventLogTest deviceauth_llt" app_samples,@ohos/app_samples,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,,,,,, -appexecfwk_appexecfwk_lite,@ohos/appexecfwk_appexecfwk_lite,N,Y,N,N,N,Y,N,N,Y,Y,Y,N,Y,Y,Y,Y,N,N,N,N,N,N,N,Y,Y,N,N,N,N,N,N,,,,,, +bundlemanager_bundle_framework_lite,@ohos/bundlemanager_bundle_framework_lite,N,Y,N,N,N,Y,N,N,Y,Y,Y,N,Y,Y,Y,Y,N,N,N,N,N,N,N,Y,Y,N,N,N,N,N,N,,,,,, bundlemanager_bundle_framework,@ohos/bundlemanager_bundle_framework,N,N,N,N,N,N,N,Y,N,Y,Y,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,Y,Y,N,N,,,,"BmsBundleInstallerTest BmsBundleUninstallerTest BmsServiceStartupTest @@ -148,7 +148,10 @@ deviceauth_llt" applications_launcher,@ohos/applications_launcher,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,,N,N,,,,,, applications_camera,@ohos/applications_camera,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,,N,N,,,,,, applications_sample_camera,@ohos/applications_sample_camera,N,N,N,N,N,Y,N,N,Y,Y,Y,N,N,N,N,Y,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,,,,,, -applications_sample_wifi_iot,@ohos/applications_sample_wifi_iot,N,N,N,N,N,N,N,Y,N,N,N,N,N,Y,Y,N,N,N,N,N,N,N,N,Y,Y,N,N,N,N,N,N,,,,,, +applications_sample_wifi_iot,@ohos/applications_sample_wifi_iot,N,N,N,N,N,N,N,Y,N,N,N,Y,Y,Y,Y,N,Y,Y,N,N,Y,Y,Y,Y,Y,N,Y,Y,Y,N,Y,,,,"EventLogTest +deviceauth_llt","EventLogTest +deviceauth_llt","EventLogTest +deviceauth_llt" applications_settings,@ohos/applications_settings,N,N,N,N,N,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,N,N,N,,,,"EventLogTest deviceauth_llt","EventLogTest deviceauth_llt","EventLogTest @@ -312,11 +315,7 @@ docs,@ohos/docs,N,N,N,N,N,N,N,Y,N,Y,Y,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,N,N,N,,, deviceauth_llt","EventLogTest deviceauth_llt","EventLogTest deviceauth_llt" -drivers_adapter,@ohos/drivers_adapter,Y,Y,N,N,Y,Y,N,Y,Y,Y,Y,Y,N,Y,Y,Y,Y,Y,N,N,N,Y,Y,Y,Y,Y,Y,N,Y,N,N,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,"hdf_adapter_uhdf_test_ioservice -hdf_adapter_uhdf_test_sbuf",hdf_adapter_uhdf_test_sbuf,hdf_adapter_uhdf_test_sbuf -drivers_adapter_khdf_linux,@ohos/drivers_adapter_khdf_linux,N,N,N,N,N,N,N,N,N,Y,Y,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,Y,N,N,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,"hdf_adapter_uhdf_test_ioservice -hdf_adapter_uhdf_test_sbuf",hdf_adapter_uhdf_test_sbuf,hdf_adapter_uhdf_test_sbuf -drivers_framework,@ohos/drivers_framework,Y,Y,N,N,N,Y,N,Y,Y,Y,Y,Y,N,Y,Y,Y,Y,Y,N,N,N,Y,Y,Y,Y,Y,Y,N,Y,N,N,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,"hdf_adapter_uhdf_test_ioservice +drivers_framework,@ohos/drivers_framework,Y,Y,N,N,Y,Y,N,Y,Y,Y,Y,Y,N,Y,Y,Y,Y,Y,N,N,N,Y,Y,Y,Y,Y,Y,N,Y,N,N,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,"hdf_adapter_uhdf_test_ioservice hdf_adapter_uhdf_test_sbuf",hdf_adapter_uhdf_test_sbuf,hdf_adapter_uhdf_test_sbuf drivers_liteos,@ohos/drivers_liteos,N,Y,N,N,N,Y,N,Y,Y,Y,Y,N,Y,Y,Y,Y,N,N,N,N,N,N,N,Y,Y,N,N,N,N,N,N,liteos_a_drivers_unittest_door.bin,,liteos_a_drivers_unittest_door.bin,,, drivers_peripheral,@ohos/drivers_peripheral,N,Y,N,N,N,Y,N,Y,Y,Y,Y,Y,N,Y,Y,Y,Y,Y,N,N,N,Y,Y,Y,Y,Y,Y,N,N,N,N,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,hdf_adapter_uhdf_test_door.bin,"hdf_adapter_uhdf_test_ioservice @@ -396,7 +395,6 @@ interface_sdk-js,@ohos/interface_sdk_js,N,N,N,N,N,N,N,N,N,Y,Y,N,N,N,N,N,Y,Y,N,N, deviceauth_llt","EventLogTest deviceauth_llt","EventLogTest deviceauth_llt" -iot_link,@ohos/iot_link,N,Y,N,Y,N,Y,N,Y,N,Y,Y,N,N,Y,Y,N,N,N,N,N,N,N,N,Y,Y,N,N,N,N,N,N,,,,,, iothardware_peripheral,@ohos/iothardware_peripheral,N,Y,N,Y,N,Y,N,Y,Y,Y,Y,N,N,Y,Y,Y,N,N,N,N,N,N,N,Y,Y,N,N,N,N,N,N,,,,,, kernel_linux,@ohos/kernel_linux,N,N,N,N,N,N,N,N,N,N,Y,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,Y,Y,N,N,,,,"EventLogTest deviceauth_llt","EventLogTest @@ -554,11 +552,11 @@ useriam_pin_auth,@ohos/useriam_pin_auth,N,N,N,N,N,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N, deviceauth_llt","EventLogTest deviceauth_llt","EventLogTest deviceauth_llt" -useriam_user_auth,@ohos/useriam_user_auth,N,N,N,N,N,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,Y,N,N,,,,"EventLogTest +useriam_user_auth_framework,@ohos/useriam_user_auth_framework,N,N,N,N,N,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,Y,N,N,,,,"EventLogTest deviceauth_llt","EventLogTest deviceauth_llt","EventLogTest deviceauth_llt" -useriam_faceauth,@ohos/useriam_faceauth,N,N,N,N,Y,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,N,N,N,,,,"EventLogTest +useriam_face_auth,@ohos/useriam_face_auth,N,N,N,N,Y,N,N,N,N,N,N,Y,N,N,N,N,Y,Y,N,N,N,Y,Y,N,N,Y,Y,N,N,N,N,,,,"EventLogTest deviceauth_llt","EventLogTest deviceauth_llt","EventLogTest deviceauth_llt" diff --git a/ohos/ohos.xml b/ohos/ohos.xml index 2cc74a9..21863df 100644 --- a/ohos/ohos.xml +++ b/ohos/ohos.xml @@ -1,13 +1,13 @@ - + - + - + @@ -33,9 +33,7 @@ - - - + @@ -47,7 +45,6 @@ - @@ -110,7 +107,10 @@ + + + @@ -192,7 +192,7 @@ - + @@ -210,16 +210,16 @@ - + - - - + + + -- GitLab