From 4a81d3bd8489c1836bc32f3fe68d750c77141b39 Mon Sep 17 00:00:00 2001 From: jiyong Date: Tue, 30 Mar 2021 21:05:17 +0800 Subject: [PATCH] =?UTF-8?q?acts=E5=AD=90=E7=B3=BB=E7=BB=9F=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I889e58c6b4d317b4af0f5cc6723f90700d31fcc7 --- .../ability_posix}/BUILD.gn | 0 .../ability_posix}/Test.json | 12 ++++++------ .../ability_posix}/src/AbilityMgrTest.cpp | 0 .../ability_posix}/src/AbilityMgrTest2.cpp | 0 .../BUILD.gn | 0 .../Test.json | 0 .../src/BundleMgrTest.cpp | 0 build_lite/BUILD.gn | 16 ++++++++-------- .../{wifiiot_hal => iot_controller_hal}/BUILD.gn | 0 .../Test.tmpl | 0 .../src/iot_flash_test.c | 0 .../src/iot_gpio_test.c | 0 .../src/iot_i2c_test.c | 0 .../src/iot_pwm_test.c | 0 .../src/iot_uart_test.c | 0 .../src/iot_watchdog_test.c | 0 .../src/lowpower_test.c | 0 .../src/reset_test.c | 0 .../syspara_hal}/BUILD.gn | 0 .../syspara_hal}/Test.tmpl | 0 .../syspara_hal}/src/parameter_func_test.c | 0 .../syspara_hal}/src/parameter_reli_test.c | 0 .../syspara_hal}/src/parameter_utils.c | 0 .../syspara_hal}/src/parameter_utils.h | 0 .../{parameter_posix => syspara_posix}/BUILD.gn | 0 .../{parameter_posix => syspara_posix}/Test.json | 0 .../src/ParameterTest.cpp | 0 utils_lite/{utilsfile_hal => file_hal}/BUILD.gn | 0 utils_lite/{parameter_hal => file_hal}/Test.tmpl | 0 .../src/utils_file_func_test.c | 0 .../src/utils_file_reli_test.c | 0 .../{kvstore_hal => kv_store_hal}/BUILD.gn | 0 .../{utilsfile_hal => kv_store_hal}/Test.tmpl | 0 .../src/kvstore_func_test.c | 0 .../{kvstore_posix => kv_store_posix}/BUILD.gn | 0 .../{kvstore_posix => kv_store_posix}/Test.json | 0 .../src/KvStoreTest.cpp | 0 37 files changed, 14 insertions(+), 14 deletions(-) rename {appexecfwk_lite/abilityms_posix => aafwk_lite/ability_posix}/BUILD.gn (100%) rename {appexecfwk_lite/abilityms_posix => aafwk_lite/ability_posix}/Test.json (59%) rename {appexecfwk_lite/abilityms_posix => aafwk_lite/ability_posix}/src/AbilityMgrTest.cpp (100%) rename {appexecfwk_lite/abilityms_posix => aafwk_lite/ability_posix}/src/AbilityMgrTest2.cpp (100%) rename appexecfwk_lite/{bundlems_posix => bundle_mgr_posix}/BUILD.gn (100%) rename appexecfwk_lite/{bundlems_posix => bundle_mgr_posix}/Test.json (100%) rename appexecfwk_lite/{bundlems_posix => bundle_mgr_posix}/src/BundleMgrTest.cpp (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/BUILD.gn (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/Test.tmpl (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/src/iot_flash_test.c (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/src/iot_gpio_test.c (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/src/iot_i2c_test.c (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/src/iot_pwm_test.c (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/src/iot_uart_test.c (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/src/iot_watchdog_test.c (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/src/lowpower_test.c (100%) rename iot_hardware_lite/{wifiiot_hal => iot_controller_hal}/src/reset_test.c (100%) rename {utils_lite/parameter_hal => startup_lite/syspara_hal}/BUILD.gn (100%) rename {utils_lite/kvstore_hal => startup_lite/syspara_hal}/Test.tmpl (100%) rename {utils_lite/parameter_hal => startup_lite/syspara_hal}/src/parameter_func_test.c (100%) rename {utils_lite/parameter_hal => startup_lite/syspara_hal}/src/parameter_reli_test.c (100%) rename {utils_lite/parameter_hal => startup_lite/syspara_hal}/src/parameter_utils.c (100%) rename {utils_lite/parameter_hal => startup_lite/syspara_hal}/src/parameter_utils.h (100%) rename startup_lite/{parameter_posix => syspara_posix}/BUILD.gn (100%) rename startup_lite/{parameter_posix => syspara_posix}/Test.json (100%) rename startup_lite/{parameter_posix => syspara_posix}/src/ParameterTest.cpp (100%) rename utils_lite/{utilsfile_hal => file_hal}/BUILD.gn (100%) rename utils_lite/{parameter_hal => file_hal}/Test.tmpl (100%) rename utils_lite/{utilsfile_hal => file_hal}/src/utils_file_func_test.c (100%) rename utils_lite/{utilsfile_hal => file_hal}/src/utils_file_reli_test.c (100%) rename utils_lite/{kvstore_hal => kv_store_hal}/BUILD.gn (100%) rename utils_lite/{utilsfile_hal => kv_store_hal}/Test.tmpl (100%) rename utils_lite/{kvstore_hal => kv_store_hal}/src/kvstore_func_test.c (100%) rename utils_lite/{kvstore_posix => kv_store_posix}/BUILD.gn (100%) rename utils_lite/{kvstore_posix => kv_store_posix}/Test.json (100%) rename utils_lite/{kvstore_posix => kv_store_posix}/src/KvStoreTest.cpp (100%) diff --git a/appexecfwk_lite/abilityms_posix/BUILD.gn b/aafwk_lite/ability_posix/BUILD.gn similarity index 100% rename from appexecfwk_lite/abilityms_posix/BUILD.gn rename to aafwk_lite/ability_posix/BUILD.gn diff --git a/appexecfwk_lite/abilityms_posix/Test.json b/aafwk_lite/ability_posix/Test.json similarity index 59% rename from appexecfwk_lite/abilityms_posix/Test.json rename to aafwk_lite/ability_posix/Test.json index 0bbdb9966..26a46f4f0 100755 --- a/appexecfwk_lite/abilityms_posix/Test.json +++ b/aafwk_lite/ability_posix/Test.json @@ -12,17 +12,17 @@ "server": "NfsServer", "mount": [ { - "source": "testcases/appexecfwk", - "target": "/test_root/appexecfwk" + "source": "testcases/aafwk", + "target": "/test_root/aafwk" },{ - "source": "resource/appexecfwk", - "target": "/test_root/appexecfwk" + "source": "resource/aafwk", + "target": "/test_root/aafwk" } ] } ], "driver": { "type": "CppTestLite", - "execute": "/test_root/appexecfwk/ActsAbilityMgrTest.bin" + "execute": "/test_root/aafwk/ActsAbilityMgrTest.bin" } -} \ No newline at end of file +} diff --git a/appexecfwk_lite/abilityms_posix/src/AbilityMgrTest.cpp b/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp similarity index 100% rename from appexecfwk_lite/abilityms_posix/src/AbilityMgrTest.cpp rename to aafwk_lite/ability_posix/src/AbilityMgrTest.cpp diff --git a/appexecfwk_lite/abilityms_posix/src/AbilityMgrTest2.cpp b/aafwk_lite/ability_posix/src/AbilityMgrTest2.cpp similarity index 100% rename from appexecfwk_lite/abilityms_posix/src/AbilityMgrTest2.cpp rename to aafwk_lite/ability_posix/src/AbilityMgrTest2.cpp diff --git a/appexecfwk_lite/bundlems_posix/BUILD.gn b/appexecfwk_lite/bundle_mgr_posix/BUILD.gn similarity index 100% rename from appexecfwk_lite/bundlems_posix/BUILD.gn rename to appexecfwk_lite/bundle_mgr_posix/BUILD.gn diff --git a/appexecfwk_lite/bundlems_posix/Test.json b/appexecfwk_lite/bundle_mgr_posix/Test.json similarity index 100% rename from appexecfwk_lite/bundlems_posix/Test.json rename to appexecfwk_lite/bundle_mgr_posix/Test.json diff --git a/appexecfwk_lite/bundlems_posix/src/BundleMgrTest.cpp b/appexecfwk_lite/bundle_mgr_posix/src/BundleMgrTest.cpp similarity index 100% rename from appexecfwk_lite/bundlems_posix/src/BundleMgrTest.cpp rename to appexecfwk_lite/bundle_mgr_posix/src/BundleMgrTest.cpp diff --git a/build_lite/BUILD.gn b/build_lite/BUILD.gn index 3879f0fe6..328fe9dd9 100644 --- a/build_lite/BUILD.gn +++ b/build_lite/BUILD.gn @@ -34,11 +34,11 @@ lite_component("acts_component") { "//test/xts/acts/communication_lite/lwip_hal:ActsLwipTest", "//test/xts/acts/communication_lite/softbus_hal:ActsSoftBusTest", "//test/xts/acts/communication_lite/wifiservice_hal:ActsWifiServiceTest", - "//test/xts/acts/utils_lite/utilsfile_hal:ActsUtilsFileTest", - "//test/xts/acts/utils_lite/parameter_hal:ActsParameterTest", - "//test/xts/acts/iot_hardware_lite/wifiiot_hal:ActsWifiIotTest", + "//test/xts/acts/utils_lite/file_hal:ActsUtilsFileTest", + "//test/xts/acts/startup_lite/syspara_hal:ActsParameterTest", + "//test/xts/acts/iot_hardware_lite/iot_controller_hal:ActsWifiIotTest", "//test/xts/acts/kernel_lite/kernelcmsis_hal:ActsCMSISTest", - "//test/xts/acts/utils_lite/kvstore_hal:ActsKvStoreTest", + "//test/xts/acts/utils_lite/kv_store_hal:ActsKvStoreTest", "//test/xts/acts/security_lite/datahuks_hal:ActsSecurityDataTest", "//test/xts/acts/distributed_schedule_lite/samgr_hal:ActsSamgrTest", @@ -49,8 +49,8 @@ lite_component("acts_component") { all_features += [ "//test/xts/acts/kernel_lite:ActsKernelTest", "//test/xts/acts/security_lite:securitytest", - "//test/xts/acts/utils_lite/kvstore_posix:ActsKvStoreTest", - "//test/xts/acts/startup_lite/parameter_posix:ActsParameterTest", + "//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest", + "//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest", "//test/xts/acts/startup_lite/bootstrap_posix:ActsBootstrapTest", "//test/xts/acts/multimedia_lite/multimedia_posix/camera:ActsMediaCameraTest", "//test/xts/acts/open_posix_testsuite/conformance/interfaces:ActsOpenPosixTest", @@ -64,8 +64,8 @@ lite_component("acts_component") { "//test/xts/acts/graphic_lite/graphic_utils:uikit_test1", "//test/xts/acts/graphic_lite/surface:uikit_test2", "//test/xts/acts/graphic_lite/ui:uikit_test3", - "//test/xts/acts/appexecfwk_lite/bundlems_posix:ActsBundleMgrTest", - "//test/xts/acts/appexecfwk_lite/abilityms_posix:ActsAbilityMgrTest", + "//test/xts/acts/appexecfwk_lite/bundle_mgr_posix:ActsBundleMgrTest", + "//test/xts/acts/aafwk_lite/ability_posix:ActsAbilityMgrTest", "//test/xts/acts/communication_lite/softbus_posix:ActsSoftBusTest", "//test/xts/acts/communication_lite/lwip_posix:ActsLwipTest", diff --git a/iot_hardware_lite/wifiiot_hal/BUILD.gn b/iot_hardware_lite/iot_controller_hal/BUILD.gn similarity index 100% rename from iot_hardware_lite/wifiiot_hal/BUILD.gn rename to iot_hardware_lite/iot_controller_hal/BUILD.gn diff --git a/iot_hardware_lite/wifiiot_hal/Test.tmpl b/iot_hardware_lite/iot_controller_hal/Test.tmpl similarity index 100% rename from iot_hardware_lite/wifiiot_hal/Test.tmpl rename to iot_hardware_lite/iot_controller_hal/Test.tmpl diff --git a/iot_hardware_lite/wifiiot_hal/src/iot_flash_test.c b/iot_hardware_lite/iot_controller_hal/src/iot_flash_test.c similarity index 100% rename from iot_hardware_lite/wifiiot_hal/src/iot_flash_test.c rename to iot_hardware_lite/iot_controller_hal/src/iot_flash_test.c diff --git a/iot_hardware_lite/wifiiot_hal/src/iot_gpio_test.c b/iot_hardware_lite/iot_controller_hal/src/iot_gpio_test.c similarity index 100% rename from iot_hardware_lite/wifiiot_hal/src/iot_gpio_test.c rename to iot_hardware_lite/iot_controller_hal/src/iot_gpio_test.c diff --git a/iot_hardware_lite/wifiiot_hal/src/iot_i2c_test.c b/iot_hardware_lite/iot_controller_hal/src/iot_i2c_test.c similarity index 100% rename from iot_hardware_lite/wifiiot_hal/src/iot_i2c_test.c rename to iot_hardware_lite/iot_controller_hal/src/iot_i2c_test.c diff --git a/iot_hardware_lite/wifiiot_hal/src/iot_pwm_test.c b/iot_hardware_lite/iot_controller_hal/src/iot_pwm_test.c similarity index 100% rename from iot_hardware_lite/wifiiot_hal/src/iot_pwm_test.c rename to iot_hardware_lite/iot_controller_hal/src/iot_pwm_test.c diff --git a/iot_hardware_lite/wifiiot_hal/src/iot_uart_test.c b/iot_hardware_lite/iot_controller_hal/src/iot_uart_test.c similarity index 100% rename from iot_hardware_lite/wifiiot_hal/src/iot_uart_test.c rename to iot_hardware_lite/iot_controller_hal/src/iot_uart_test.c diff --git a/iot_hardware_lite/wifiiot_hal/src/iot_watchdog_test.c b/iot_hardware_lite/iot_controller_hal/src/iot_watchdog_test.c similarity index 100% rename from iot_hardware_lite/wifiiot_hal/src/iot_watchdog_test.c rename to iot_hardware_lite/iot_controller_hal/src/iot_watchdog_test.c diff --git a/iot_hardware_lite/wifiiot_hal/src/lowpower_test.c b/iot_hardware_lite/iot_controller_hal/src/lowpower_test.c similarity index 100% rename from iot_hardware_lite/wifiiot_hal/src/lowpower_test.c rename to iot_hardware_lite/iot_controller_hal/src/lowpower_test.c diff --git a/iot_hardware_lite/wifiiot_hal/src/reset_test.c b/iot_hardware_lite/iot_controller_hal/src/reset_test.c similarity index 100% rename from iot_hardware_lite/wifiiot_hal/src/reset_test.c rename to iot_hardware_lite/iot_controller_hal/src/reset_test.c diff --git a/utils_lite/parameter_hal/BUILD.gn b/startup_lite/syspara_hal/BUILD.gn similarity index 100% rename from utils_lite/parameter_hal/BUILD.gn rename to startup_lite/syspara_hal/BUILD.gn diff --git a/utils_lite/kvstore_hal/Test.tmpl b/startup_lite/syspara_hal/Test.tmpl similarity index 100% rename from utils_lite/kvstore_hal/Test.tmpl rename to startup_lite/syspara_hal/Test.tmpl diff --git a/utils_lite/parameter_hal/src/parameter_func_test.c b/startup_lite/syspara_hal/src/parameter_func_test.c similarity index 100% rename from utils_lite/parameter_hal/src/parameter_func_test.c rename to startup_lite/syspara_hal/src/parameter_func_test.c diff --git a/utils_lite/parameter_hal/src/parameter_reli_test.c b/startup_lite/syspara_hal/src/parameter_reli_test.c similarity index 100% rename from utils_lite/parameter_hal/src/parameter_reli_test.c rename to startup_lite/syspara_hal/src/parameter_reli_test.c diff --git a/utils_lite/parameter_hal/src/parameter_utils.c b/startup_lite/syspara_hal/src/parameter_utils.c similarity index 100% rename from utils_lite/parameter_hal/src/parameter_utils.c rename to startup_lite/syspara_hal/src/parameter_utils.c diff --git a/utils_lite/parameter_hal/src/parameter_utils.h b/startup_lite/syspara_hal/src/parameter_utils.h similarity index 100% rename from utils_lite/parameter_hal/src/parameter_utils.h rename to startup_lite/syspara_hal/src/parameter_utils.h diff --git a/startup_lite/parameter_posix/BUILD.gn b/startup_lite/syspara_posix/BUILD.gn similarity index 100% rename from startup_lite/parameter_posix/BUILD.gn rename to startup_lite/syspara_posix/BUILD.gn diff --git a/startup_lite/parameter_posix/Test.json b/startup_lite/syspara_posix/Test.json similarity index 100% rename from startup_lite/parameter_posix/Test.json rename to startup_lite/syspara_posix/Test.json diff --git a/startup_lite/parameter_posix/src/ParameterTest.cpp b/startup_lite/syspara_posix/src/ParameterTest.cpp similarity index 100% rename from startup_lite/parameter_posix/src/ParameterTest.cpp rename to startup_lite/syspara_posix/src/ParameterTest.cpp diff --git a/utils_lite/utilsfile_hal/BUILD.gn b/utils_lite/file_hal/BUILD.gn similarity index 100% rename from utils_lite/utilsfile_hal/BUILD.gn rename to utils_lite/file_hal/BUILD.gn diff --git a/utils_lite/parameter_hal/Test.tmpl b/utils_lite/file_hal/Test.tmpl similarity index 100% rename from utils_lite/parameter_hal/Test.tmpl rename to utils_lite/file_hal/Test.tmpl diff --git a/utils_lite/utilsfile_hal/src/utils_file_func_test.c b/utils_lite/file_hal/src/utils_file_func_test.c similarity index 100% rename from utils_lite/utilsfile_hal/src/utils_file_func_test.c rename to utils_lite/file_hal/src/utils_file_func_test.c diff --git a/utils_lite/utilsfile_hal/src/utils_file_reli_test.c b/utils_lite/file_hal/src/utils_file_reli_test.c similarity index 100% rename from utils_lite/utilsfile_hal/src/utils_file_reli_test.c rename to utils_lite/file_hal/src/utils_file_reli_test.c diff --git a/utils_lite/kvstore_hal/BUILD.gn b/utils_lite/kv_store_hal/BUILD.gn similarity index 100% rename from utils_lite/kvstore_hal/BUILD.gn rename to utils_lite/kv_store_hal/BUILD.gn diff --git a/utils_lite/utilsfile_hal/Test.tmpl b/utils_lite/kv_store_hal/Test.tmpl similarity index 100% rename from utils_lite/utilsfile_hal/Test.tmpl rename to utils_lite/kv_store_hal/Test.tmpl diff --git a/utils_lite/kvstore_hal/src/kvstore_func_test.c b/utils_lite/kv_store_hal/src/kvstore_func_test.c similarity index 100% rename from utils_lite/kvstore_hal/src/kvstore_func_test.c rename to utils_lite/kv_store_hal/src/kvstore_func_test.c diff --git a/utils_lite/kvstore_posix/BUILD.gn b/utils_lite/kv_store_posix/BUILD.gn similarity index 100% rename from utils_lite/kvstore_posix/BUILD.gn rename to utils_lite/kv_store_posix/BUILD.gn diff --git a/utils_lite/kvstore_posix/Test.json b/utils_lite/kv_store_posix/Test.json similarity index 100% rename from utils_lite/kvstore_posix/Test.json rename to utils_lite/kv_store_posix/Test.json diff --git a/utils_lite/kvstore_posix/src/KvStoreTest.cpp b/utils_lite/kv_store_posix/src/KvStoreTest.cpp similarity index 100% rename from utils_lite/kvstore_posix/src/KvStoreTest.cpp rename to utils_lite/kv_store_posix/src/KvStoreTest.cpp -- GitLab