完成global子系统i18n,resourceManager模块的跨平台测试套

Signed-off-by: N hu0475 <huyanqiang5@huawei.com>

完成global子系统i18n,resourceManager模块的跨平台测试套
Signed-off-by: N hu0475 <huyanqiang5@huawei.com>
5a3e43ec · hu0475 · 48f12bdd · 5a3e43ec
隐藏空白更改
内联并排

Showing with 1 addition and 6 deletion

global/BUILD.gn global/BUILD.gn +1 -6

未找到文件。
--- a/global/BUILD.gn
+++ b/global/BUILD.gn
@@ -17,13 +17,8 @@ group("global") {
  testonly = true
  if (is_standard_system) {
    deps = [
-<<<<<<< HEAD
-      "crossplatform/resourcemanageretstest:ActsCrossplatformResourceManagerTest",
      "crossplatform/i18netstest:ActsCrossplatformI18nTest",
-=======
-      "crossplatform/i18netstest:i18n_ets_test",
-      "crossplatform/resourcemanageretstest:resourceManager_ets_test",
->>>>>>> 183fc0f8eb48db8c3fb9c9feb29c6310d5e5f523
+      "crossplatform/resourcemanageretstest:ActsCrossplatformResourceManagerTest",
      "global_napi_test:ActsGlobalNapiTest",
      "global_stage:global_stage_hap",
      "i18n_standard/intljs:intljs_test",