diff --git a/README.md b/README.md index 92a9bacd7f37708d17bc405417b48c9d0f5f31b7..cf50372966cce9c7c1f08edfb5e98868d967bc98 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 c9cb420bc1501792fac19c1fe3147f98014a567d..dcf5d8dffd802de722851b7c0c7cc2ee3497d16c 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 69c3c32317c29ebdad62b1cae48f74373ff0f0d6..995b39b56fabd8f84db7799c09bb457d55acc27a 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 8be5042cea91d2a4fead8fa74597f4b2a46557d7..338146cb321fe9a651cc16ce23a6f1a87f390402 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 77ef648bc2c0377477fb5e646aa3470ed532ab31..0f49f8eee91130365e74ad0bb3b2e139594dc316 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 41ca5670052220311090d4ac50673c497b4d983b..3f25110d219132e20e2afc6104b555df352ab9cc 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 3250bf446c0cbacd7f78c33ac7667dd8b6a3b034..c5d9f8b7cbb9584f784cf5ab123cbb21b61a7ed0 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 8b9d1f52722a5f5da572aa0bfc8442baa9180449..429371777b8ee421d8b3d631db25b7869fbb4139 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 e977025a54b781a2ce841b17cf66e91bb873a71a..b2b6a9ffe570c40bfcabb6706d1326a11e61a654 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 0317f9becec32b5eac2e5c5948eb3238bec89c30..2cb8c20fb6bb605c88c422e3294c770f74d917ee 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 29a26074509406cb7541819e9866be4c99a09381..cd563c0a8b115ec1ea431cf60fa010c8f0088741 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 5659f37fe3d4397fe7c0ed2a86849bcf23720177..5303e22d3f42c076041c681eaff2200d8f6d6908 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 3a64c0d35bb588858f3f3a487460f55860e8d287..ecb78d69bade4a2687f19761f6b575b34a4ec4f7 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 69546d1551039cc03e6759bcf3a639b4d0f24da5..b717e7e267c7200ddd4ca2252f27ea2455cdb9e0 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 95e0a2059b6f9ec65133db60b0bb4f94d3cb7c51..1f26b80a90cbf442e2bd97657e4232991002f0a0 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 4a9d0e8969f5cf9361bd5888e7b99cedc3a6ea83..d8de4f1bf76c6fd4362f94a247e9c7532b156f9b 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 73201f3f8b9c251e68c22ea68c725731e0e7ee59..eb780faa4d3b7ed2ac40a823a7576b716fd73b3a 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 73201f3f8b9c251e68c22ea68c725731e0e7ee59..eb780faa4d3b7ed2ac40a823a7576b716fd73b3a 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 73201f3f8b9c251e68c22ea68c725731e0e7ee59..eb780faa4d3b7ed2ac40a823a7576b716fd73b3a 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 54217ef1da3aceb9552d0df91ac797417825a4ff..366797336095673f0ab65757761f5457675fedf0 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 7d03f1a01bf4d60dc4ecfd5229fe3d8ed76a3dad..eb737084565d90c540556a2cf3a8b0152d24e2e9 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 4097147c62c5fab059f1465f717956fda572b49a..82d4c41458b30dd2cb47b37da2c6be1dfef8e92d 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 1162b7604ec54586431d6dc0bbd12029fbcdc889..0f02be21048dfdba6b179c837a5490c0e7812f81 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 036ad624cff71969d4ad0dec7b71c459eda766ab..52e56e65cd60b84960e3745b7f124e915c47dd39 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 09a2bccb6f9a9d946425c7fe92915ed1b03bd84b..b2f6a7db5a153dee14cd2d8935ab492bb5d50c8d 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 5a409b339b26bdcdc700499ea4d334d9e76bdc78..351e101d4949153500d9c4fcc8da9c58b3c97c05 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 cace4a7dadf05e9203663676e0b18994b69d9376..70e44bf61ce636775c1963640ee8fc1116d8d2c1 100755 --- a/chipsets/v200zr/v200zr.xml +++ b/chipsets/v200zr/v200zr.xml @@ -1,7 +1,7 @@ - + diff --git a/default.xml b/default.xml index 8154f4040e2a704b4cf009de6f19b3e0494a2563..24ef2adc3428b5163c2ee267ef60c48371d2d616 100755 --- a/default.xml +++ b/default.xml @@ -1,7 +1,7 @@ - + diff --git a/devboard.xml b/devboard.xml index 9a1b78613bef91fb59719290f92b0327c1305dbe..2b577a9f134744ca8dc615e01f33c490ffb1cc10 100644 --- a/devboard.xml +++ b/devboard.xml @@ -2,21 +2,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/matrix_product.csv b/matrix_product.csv index 36bf89d022b3744181993150555180d80ec4506d..f1c7323cdd12da777ea2cdb129320f2a957b472b 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 2cc74a92c965806a9b034510daf09678d4e59087..21863df27bb8fb596aed17880e928689107261f7 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 @@ - + - - - + + +