diff --git a/ability_lite/ability_hal/BUILD.gn b/ability_lite/ability_hal/BUILD.gn index 84ebfe68810b21ba7f91b6ac67ae657881a092ab..3650c65204b8966dc557c3f921ddceb5b79cba03 100755 --- a/ability_lite/ability_hal/BUILD.gn +++ b/ability_lite/ability_hal/BUILD.gn @@ -21,5 +21,7 @@ hctest_suite("ActsAbilityMgrTest") { "${aafwk_lite_path}/interfaces/kits/ability_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + 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 6220a7b435d4066a1687e35ad1df70a4129c0509..f97f63c152dac8902388f12ba4ea33d4c6ee692f 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 "ability_manager.h" +#include "slite/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 9f3fbee93a8a4b165c9e0c01ba9000b9f01fb7aa..586f56a3faff677aa5f297645cfcfe83c7ad55f2 100755 --- a/appexecfwk_lite/appexecfwk_hal/BUILD.gn +++ b/appexecfwk_lite/appexecfwk_hal/BUILD.gn @@ -23,5 +23,7 @@ hctest_suite("ActsBundleMgrTest") { "${appexecfwk_lite_path}/utils/bundle_lite", "//commonlibrary/utils_lite/memory/include", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + cflags = [ "-Wno-error" ] + } } diff --git a/build_lite/BUILD.gn b/build_lite/BUILD.gn index 93f253cb187ec05905e5550289f53eec9af13669..8a989ddc689688120fbc35ceeb806c61fe3be23c 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_path}/config.json") + _product_json = rebase_path("${product_config_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 c81009b351a1980681bb3e9bebffe2ecf5856c2a..94d5be2a46c5247dd3aad6c65f2b964df175a8a1 100644 --- a/commonlibrary_lite/file_hal/BUILD.gn +++ b/commonlibrary_lite/file_hal/BUILD.gn @@ -24,5 +24,7 @@ hctest_suite("ActsUtilsFileTest") { "src", "//commonlibrary/utils_lite/include", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + cflags = [ "-Wno-error" ] + } } diff --git a/communication_lite/dsoftbus_hal/BUILD.gn b/communication_lite/dsoftbus_hal/BUILD.gn index f8d882f03bd51e336c109867a90d90217ca7c126..4c0a0facc96e4e5a9a20295fc70b7ce70dad9fd2 100644 --- a/communication_lite/dsoftbus_hal/BUILD.gn +++ b/communication_lite/dsoftbus_hal/BUILD.gn @@ -30,5 +30,7 @@ hctest_suite("ActsDsoftbusMgrTest") { "//foundation/communication/dsoftbus/adapter/common/include", "//foundation/communication/dsoftbus/adapter/default_config/spec_config", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + 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 8c0e2a78c3c2d76ed9ca775edf604ec0831a0751..c727b6b0f1d5939dbfd4822b7128c727e088ac63 100755 --- a/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn +++ b/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn @@ -50,5 +50,7 @@ hctest_suite("ActsSamgrTest") { [ "//foundation/systemabilitymgr/samgr_lite/samgr/adapter:samgr_adapter" ] defines = [ "UNITY_INCLUDE_CONFIG_H" ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + 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 8995f0af44122b20ed80a54af7c320b381def211..6de670705ec851b2829da51e657dbb49e472d66c 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,10 +219,6 @@ 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 845d377a1a65827d07b5dfc21c65f554a37c46b1..cf24a4f70d2a6e11386a6539db007dbb0bd8a799 100755 --- a/hiviewdfx_lite/hievent_hal/BUILD.gn +++ b/hiviewdfx_lite/hievent_hal/BUILD.gn @@ -21,5 +21,7 @@ hctest_suite("ActsHieventLiteTest") { "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + 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 c9e815bf320619fe1818507af3dff41bb576840e..19c7ff677e9d7334de1f729e1d26298787523d25 100755 --- a/hiviewdfx_lite/hievent_hal/src/hievent_lite_test.c +++ b/hiviewdfx_lite/hievent_hal/src/hievent_lite_test.c @@ -53,11 +53,12 @@ static BOOL HieventLiteTestSuiteTearDown(void) * @param : module name is hievet_lite * @param : test suit name is HieventLiteTest */ -static HieventProc HieventLiteTestOutputFunc(uint8 *data) +static int HieventLiteTestOutputFunc(uint8 *data) { HiEvent *e = (HiEvent *)data; TEST_ASSERT_EQUAL_INT(HIEVENT_TEST_ID, e->common.eventId); + return 0; } /** @@ -101,7 +102,7 @@ LITE_TEST_CASE(HieventLiteTestSuite, HieventLiteFuncTest003, Level1) { HiEvent *e = HiEventCreate(HIEVENT_FAULT, HIEVENT_TEST_ID, 3); - HiEventRegisterProc(HieventLiteTestOutputFunc); + HiEventRegisterProc((HieventProc)HieventLiteTestOutputFunc); TEST_ASSERT_NOT_NULL(e); @@ -111,7 +112,7 @@ LITE_TEST_CASE(HieventLiteTestSuite, HieventLiteFuncTest003, Level1) HiEventReport(e); HiEventFlush(TRUE); - HiEventUnRegisterProc(HieventLiteTestOutputFunc); + HiEventUnRegisterProc((HieventProc)HieventLiteTestOutputFunc); }; /** diff --git a/hiviewdfx_lite/hilog_hal/BUILD.gn b/hiviewdfx_lite/hilog_hal/BUILD.gn index 441786c003fa04a138ad4977e58ceb58c476250d..6353d759f53f0e2a4f728f3538b853cbf1301403 100755 --- a/hiviewdfx_lite/hilog_hal/BUILD.gn +++ b/hiviewdfx_lite/hilog_hal/BUILD.gn @@ -26,5 +26,7 @@ hctest_suite("ActsDfxFuncTest") { "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + cflags = [ "-Wno-error" ] + } } diff --git a/startup_lite/bootstrap_hal/BUILD.gn b/startup_lite/bootstrap_hal/BUILD.gn index 9c19070bbc258312291a1dbbeb33bb505d105847..a639a9dfc22a6a54aeb9719f387eb50e1e24170f 100644 --- a/startup_lite/bootstrap_hal/BUILD.gn +++ b/startup_lite/bootstrap_hal/BUILD.gn @@ -21,5 +21,7 @@ hctest_suite("ActsBootstrapTest") { "src", "//commonlibrary/utils_lite/include", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + cflags = [ "-Wno-error" ] + } } diff --git a/startup_lite/syspara_hal/BUILD.gn b/startup_lite/syspara_hal/BUILD.gn index 95257013cdb1c0b5aadf113b528cb06b88de82ac..cc91968eb1d560a997dec12ae45ab4913ca1cbb2 100755 --- a/startup_lite/syspara_hal/BUILD.gn +++ b/startup_lite/syspara_hal/BUILD.gn @@ -26,5 +26,7 @@ hctest_suite("ActsParameterTest") { "src", "///base/startup/init/interfaces/innerkits/include/syspara", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + 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 05d2ac96df01808fdffc44bfbc0276b9de36600c..36448dd21d834fc55c86d548cb9df78585ff54ff 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 0729aa306b5e35017423e566710d63df0ad63d80..3609ca789def9d02b4b52289ae3fd57cf0e23746 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 8131871b74c469c97e2719a56028ceb1eb055525..92707220938d786ebb67c55f6f16978cec6ee962 100755 --- a/update_lite/dupdate_hal/BUILD.gn +++ b/update_lite/dupdate_hal/BUILD.gn @@ -21,5 +21,7 @@ hctest_suite("ActsUpdaterFuncTest") { "//base/update/ota_lite/interfaces/kits", ] - cflags = [ "-Wno-error" ] + if (board_toolchain_type != "iccarm") { + cflags = [ "-Wno-error" ] + } }