From b985addb23bad5ca484cd5f46d71e6dd1e1ad3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=99=93=E5=85=B5?= Date: Tue, 21 Feb 2023 11:38:42 +0000 Subject: [PATCH] =?UTF-8?q?=E3=80=90xts=5Facts=E3=80=91=E3=80=90monthly=5F?= =?UTF-8?q?20221018=E3=80=91=E6=A3=80=E6=9F=A5iccarm=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 范晓兵 --- ability_lite/ability_hal/BUILD.gn | 4 +--- ability_lite/ability_hal/src/ability_mgr_test.c | 2 +- appexecfwk_lite/appexecfwk_hal/BUILD.gn | 4 +--- build_lite/BUILD.gn | 2 +- commonlibrary_lite/file_hal/BUILD.gn | 4 +--- communication_lite/dsoftbus_hal/BUILD.gn | 4 +--- .../system_ability_manager_hal/BUILD.gn | 4 +--- .../src/broadcast_subscribe_func_test.c | 4 ++++ hiviewdfx_lite/hievent_hal/BUILD.gn | 4 +--- hiviewdfx_lite/hievent_hal/src/hievent_lite_test.c | 7 +++---- hiviewdfx_lite/hilog_hal/BUILD.gn | 4 +--- security_lite/huks/liteos_m_adapter/hks_mac_test.c | 2 +- startup_lite/bootstrap_hal/BUILD.gn | 4 +--- startup_lite/syspara_hal/BUILD.gn | 4 +--- startup_lite/syspara_hal/src/parameter_reli_test.c | 4 ++-- startup_lite/syspara_hal/src/parameter_utils.c | 2 +- update_lite/dupdate_hal/BUILD.gn | 4 +--- 17 files changed, 23 insertions(+), 40 deletions(-) diff --git a/ability_lite/ability_hal/BUILD.gn b/ability_lite/ability_hal/BUILD.gn index 3650c6520..84ebfe688 100755 --- a/ability_lite/ability_hal/BUILD.gn +++ b/ability_lite/ability_hal/BUILD.gn @@ -21,7 +21,5 @@ hctest_suite("ActsAbilityMgrTest") { "${aafwk_lite_path}/interfaces/kits/ability_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/ability_lite/ability_hal/src/ability_mgr_test.c b/ability_lite/ability_hal/src/ability_mgr_test.c index f97f63c15..6220a7b43 100755 --- a/ability_lite/ability_hal/src/ability_mgr_test.c +++ b/ability_lite/ability_hal/src/ability_mgr_test.c @@ -22,7 +22,7 @@ #include "hctest.h" #include "ohos_types.h" -#include "slite/ability_manager.h" +#include "ability_manager.h" #include "ability_errors.h" #include "want.h" diff --git a/appexecfwk_lite/appexecfwk_hal/BUILD.gn b/appexecfwk_lite/appexecfwk_hal/BUILD.gn index 586f56a3f..9f3fbee93 100755 --- a/appexecfwk_lite/appexecfwk_hal/BUILD.gn +++ b/appexecfwk_lite/appexecfwk_hal/BUILD.gn @@ -23,7 +23,5 @@ hctest_suite("ActsBundleMgrTest") { "${appexecfwk_lite_path}/utils/bundle_lite", "//commonlibrary/utils_lite/memory/include", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/build_lite/BUILD.gn b/build_lite/BUILD.gn index 8a989ddc6..93f253cb1 100644 --- a/build_lite/BUILD.gn +++ b/build_lite/BUILD.gn @@ -103,7 +103,7 @@ lite_component("acts_component") { if (ohos_build_type == "debug" && ohos_test_args != "notest") { _all_features = "" - _product_json = rebase_path("${product_config_path}/config.json") + _product_json = rebase_path("${product_path}/config.json") foreach(one_feature, all_features) { _all_features = _all_features + one_feature + "," } diff --git a/commonlibrary_lite/file_hal/BUILD.gn b/commonlibrary_lite/file_hal/BUILD.gn index 94d5be2a4..c81009b35 100644 --- a/commonlibrary_lite/file_hal/BUILD.gn +++ b/commonlibrary_lite/file_hal/BUILD.gn @@ -24,7 +24,5 @@ hctest_suite("ActsUtilsFileTest") { "src", "//commonlibrary/utils_lite/include", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/communication_lite/dsoftbus_hal/BUILD.gn b/communication_lite/dsoftbus_hal/BUILD.gn index 4c0a0facc..f8d882f03 100644 --- a/communication_lite/dsoftbus_hal/BUILD.gn +++ b/communication_lite/dsoftbus_hal/BUILD.gn @@ -30,7 +30,5 @@ hctest_suite("ActsDsoftbusMgrTest") { "//foundation/communication/dsoftbus/adapter/common/include", "//foundation/communication/dsoftbus/adapter/default_config/spec_config", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn b/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn index c727b6b0f..8c0e2a78c 100755 --- a/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn +++ b/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn @@ -50,7 +50,5 @@ hctest_suite("ActsSamgrTest") { [ "//foundation/systemabilitymgr/samgr_lite/samgr/adapter:samgr_adapter" ] defines = [ "UNITY_INCLUDE_CONFIG_H" ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/distributed_schedule_lite/system_ability_manager_hal/src/broadcast_subscribe_func_test.c b/distributed_schedule_lite/system_ability_manager_hal/src/broadcast_subscribe_func_test.c index 6de670705..8995f0af4 100755 --- a/distributed_schedule_lite/system_ability_manager_hal/src/broadcast_subscribe_func_test.c +++ b/distributed_schedule_lite/system_ability_manager_hal/src/broadcast_subscribe_func_test.c @@ -219,6 +219,10 @@ LITE_TEST_CASE(Broadcast01TestSuite, testSubscribe0020, Function | MediumTest | subscriber->AddTopic((IUnknown *)fapi, &topic0); int result = subscriber->Subscribe((IUnknown *)fapi, NULL, &c1); TEST_ASSERT_EQUAL_INT(result != 0, TRUE); + + Topic noExistTopic = -200; + result = subscriber->Subscribe((IUnknown *)fapi, &noExistTopic, &c1); + TEST_ASSERT_EQUAL_INT(result != 0, TRUE); CASE_ReleaseIUnknown(fapi); } diff --git a/hiviewdfx_lite/hievent_hal/BUILD.gn b/hiviewdfx_lite/hievent_hal/BUILD.gn index cf24a4f70..845d377a1 100755 --- a/hiviewdfx_lite/hievent_hal/BUILD.gn +++ b/hiviewdfx_lite/hievent_hal/BUILD.gn @@ -21,7 +21,5 @@ hctest_suite("ActsHieventLiteTest") { "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/hiviewdfx_lite/hievent_hal/src/hievent_lite_test.c b/hiviewdfx_lite/hievent_hal/src/hievent_lite_test.c index 19c7ff677..c9e815bf3 100755 --- a/hiviewdfx_lite/hievent_hal/src/hievent_lite_test.c +++ b/hiviewdfx_lite/hievent_hal/src/hievent_lite_test.c @@ -53,12 +53,11 @@ static BOOL HieventLiteTestSuiteTearDown(void) * @param : module name is hievet_lite * @param : test suit name is HieventLiteTest */ -static int HieventLiteTestOutputFunc(uint8 *data) +static HieventProc HieventLiteTestOutputFunc(uint8 *data) { HiEvent *e = (HiEvent *)data; TEST_ASSERT_EQUAL_INT(HIEVENT_TEST_ID, e->common.eventId); - return 0; } /** @@ -102,7 +101,7 @@ LITE_TEST_CASE(HieventLiteTestSuite, HieventLiteFuncTest003, Level1) { HiEvent *e = HiEventCreate(HIEVENT_FAULT, HIEVENT_TEST_ID, 3); - HiEventRegisterProc((HieventProc)HieventLiteTestOutputFunc); + HiEventRegisterProc(HieventLiteTestOutputFunc); TEST_ASSERT_NOT_NULL(e); @@ -112,7 +111,7 @@ LITE_TEST_CASE(HieventLiteTestSuite, HieventLiteFuncTest003, Level1) HiEventReport(e); HiEventFlush(TRUE); - HiEventUnRegisterProc((HieventProc)HieventLiteTestOutputFunc); + HiEventUnRegisterProc(HieventLiteTestOutputFunc); }; /** diff --git a/hiviewdfx_lite/hilog_hal/BUILD.gn b/hiviewdfx_lite/hilog_hal/BUILD.gn index 6353d759f..441786c00 100755 --- a/hiviewdfx_lite/hilog_hal/BUILD.gn +++ b/hiviewdfx_lite/hilog_hal/BUILD.gn @@ -26,7 +26,5 @@ hctest_suite("ActsDfxFuncTest") { "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/security_lite/huks/liteos_m_adapter/hks_mac_test.c b/security_lite/huks/liteos_m_adapter/hks_mac_test.c index ec0265ac6..f454ebbf4 100644 --- a/security_lite/huks/liteos_m_adapter/hks_mac_test.c +++ b/security_lite/huks/liteos_m_adapter/hks_mac_test.c @@ -168,7 +168,7 @@ static int32_t BaseTestMac(uint32_t index) g_testMacParams[index].keyParams.blobDataSize); } else { if (g_testMacParams[index].keyAliasParams.blobExist) { - ret = HuksGenerateKey(&key, &(g_testMacParams[index].keyAliasParams), + ret = GenerateKey(&key, &(g_testMacParams[index].keyAliasParams), &g_testMacParams[index].genKeyParamSetParams, NULL); } else { ret = TestConstuctBlob(&key, diff --git a/startup_lite/bootstrap_hal/BUILD.gn b/startup_lite/bootstrap_hal/BUILD.gn index a639a9dfc..9c19070bb 100644 --- a/startup_lite/bootstrap_hal/BUILD.gn +++ b/startup_lite/bootstrap_hal/BUILD.gn @@ -21,7 +21,5 @@ hctest_suite("ActsBootstrapTest") { "src", "//commonlibrary/utils_lite/include", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/startup_lite/syspara_hal/BUILD.gn b/startup_lite/syspara_hal/BUILD.gn index cc91968eb..95257013c 100755 --- a/startup_lite/syspara_hal/BUILD.gn +++ b/startup_lite/syspara_hal/BUILD.gn @@ -26,7 +26,5 @@ hctest_suite("ActsParameterTest") { "src", "///base/startup/init/interfaces/innerkits/include/syspara", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } diff --git a/startup_lite/syspara_hal/src/parameter_reli_test.c b/startup_lite/syspara_hal/src/parameter_reli_test.c index 36448dd21..05d2ac96d 100755 --- a/startup_lite/syspara_hal/src/parameter_reli_test.c +++ b/startup_lite/syspara_hal/src/parameter_reli_test.c @@ -299,7 +299,7 @@ LITE_TEST_CASE(ParameterReliTestSuite, testObtainSysParaReli015, Function | MediumTest | Level1) { int value1 = GetFirstApiVersion(); - TEST_ASSERT_NOT_NULL(&value1); + TEST_ASSERT_NOT_NULL(value1); TEST_ASSERT_TRUE((int)value1 == value1); for (int i = 0; i < QUERY_TIMES; i++) { int value = GetFirstApiVersion(); @@ -453,7 +453,7 @@ LITE_TEST_CASE(ParameterReliTestSuite, testObtainSysParaReli024, Function | MediumTest | Level1) { int value1 = GetSdkApiVersion(); - TEST_ASSERT_NOT_NULL(&value1); + TEST_ASSERT_NOT_NULL(value1); TEST_ASSERT_TRUE((int)value1 == value1); for (int i = 0; i < QUERY_TIMES; i++) { int value = GetSdkApiVersion(); diff --git a/startup_lite/syspara_hal/src/parameter_utils.c b/startup_lite/syspara_hal/src/parameter_utils.c index 3609ca789..0729aa306 100755 --- a/startup_lite/syspara_hal/src/parameter_utils.c +++ b/startup_lite/syspara_hal/src/parameter_utils.c @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include + #include "hctest.h" #include "parameter_utils.h" diff --git a/update_lite/dupdate_hal/BUILD.gn b/update_lite/dupdate_hal/BUILD.gn index 927072209..8131871b7 100755 --- a/update_lite/dupdate_hal/BUILD.gn +++ b/update_lite/dupdate_hal/BUILD.gn @@ -21,7 +21,5 @@ hctest_suite("ActsUpdaterFuncTest") { "//base/update/ota_lite/interfaces/kits", ] - if (board_toolchain_type != "iccarm") { - cflags = [ "-Wno-error" ] - } + cflags = [ "-Wno-error" ] } -- GitLab