!5877 回退 'Pull Request !5846 : 检查iccarm编译器'

Merge pull request !5877 from jiyong/revert-merge-5846-master

ability/ability_runtime/aacommand/AACommand08/entry/src/main/module.json

@@ -6,7 +6,9 @@
     "description": "$string:entry_test_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+      "default",
+      "phone",
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/module.json

@@ -6,7 +6,9 @@
     "description": "$string:entry_test_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+      "default",
+      "phone",
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/module.json

@@ -6,7 +6,9 @@
     "description": "$string:entry_test_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+      "default",
+      "phone",
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/module.json

@@ -6,7 +6,9 @@
     "description": "$string:entry_test_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+      "default",
+      "phone",
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/module.json

@@ -6,7 +6,9 @@
     "description": "$string:entry_test_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+      "default",
+      "phone",
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/module.json

@@ -6,7 +6,9 @@
     "description": "$string:entry_test_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+      "default",
+      "phone",
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/aacommand/AACommandtest/entry/src/main/module.json

@@ -6,7 +6,9 @@
     "description": "$string:entry_test_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+      "default",
+      "phone",
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability_lite/ability_hal/BUILD.gn

@@ -21,8 +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" ]
 }

appexecfwk_lite/appexecfwk_hal/BUILD.gn

@@ -21,8 +21,5 @@ hctest_suite("ActsBundleMgrTest") {
     "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/slite",
     "${appexecfwk_lite_path}/interfaces/kits/bundle_lite",
   ]
-
-  if (board_toolchain_type != "iccarm") {
-    cflags = [ "-Wno-error" ]
-  }
+  cflags = [ "-Wno-error" ]
 }

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 + ","
     }

commonlibrary_lite/file_hal/BUILD.gn

@@ -24,8 +24,5 @@ hctest_suite("ActsUtilsFileTest") {
     "src",
     "//commonlibrary/utils_lite/include",
   ]
-
-  if (board_toolchain_type != "iccarm") {
-    cflags = [ "-Wno-error" ]
-  }
+  cflags = [ "-Wno-error" ]
 }

communication_lite/dsoftbus_hal/BUILD.gn

@@ -30,8 +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" ]
 }

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" ]
 }

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);
 }

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" ]
 }

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 HieventProc 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);
 };
 
 /**

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" ]
 }

startup_lite/syspara_hal/BUILD.gn

@@ -26,8 +26,5 @@ hctest_suite("ActsParameterTest") {
     "src",
     "///base/startup/init/interfaces/innerkits/include/syspara",
   ]
-
-  if (board_toolchain_type != "iccarm") {
-    cflags = [ "-Wno-error" ]
-  }
+  cflags = [ "-Wno-error" ]
 }

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();

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 <string.h>
+
 #include "hctest.h"
 #include "parameter_utils.h"
 

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" ]
 }