From fe9ba40dd8fa8739a737d4b73594dfb255d02c8f Mon Sep 17 00:00:00 2001 From: wangpggg Date: Thu, 22 Aug 2024 15:47:43 +0800 Subject: [PATCH] modify realpath to relative path Signed-off-by: wangpeng --- backup.gni | 1 - test/unittest/file_permission_native/BUILD.gn | 7 ++---- .../file_share_permission_sup_test/BUILD.gn | 5 ++-- .../file_share_permission_test/BUILD.gn | 5 ++-- test/unittest/file_uri_native/BUILD.gn | 7 ++---- test/unittest/file_uri_ndk_test/BUILD.gn | 7 ++---- test/unittest/remote_file_share/BUILD.gn | 9 +++---- .../unittests/backup_api/backup_impl/BUILD.gn | 3 ++- tests/unittests/backup_ext/BUILD.gn | 24 ++++++++++--------- tests/unittests/backup_sa/module_ipc/BUILD.gn | 18 +++++++++----- tests/unittests/backup_sa/session/BUILD.gn | 8 +++---- tests/unittests/backup_tools/BUILD.gn | 6 +++-- tests/unittests/backup_utils/BUILD.gn | 18 ++++++++------ tests/utils/BUILD.gn | 9 +++---- 14 files changed, 65 insertions(+), 62 deletions(-) diff --git a/backup.gni b/backup.gni index 3b07587da..d768a521f 100644 --- a/backup.gni +++ b/backup.gni @@ -21,7 +21,6 @@ path_backup_js = path_base = "//commonlibrary/c_utils/base" path_faultloggerd = "//base/hiviewdfx/faultloggerd" path_file_api = "//foundation/filemanagement/file_api" -path_googletest = "//third_party/googletest" path_ipc = "//foundation/communication/ipc" path_jsoncpp = "//third_party/jsoncpp" path_rust = "//third_party/rust" diff --git a/test/unittest/file_permission_native/BUILD.gn b/test/unittest/file_permission_native/BUILD.gn index bb3fff721..d4b28a512 100644 --- a/test/unittest/file_permission_native/BUILD.gn +++ b/test/unittest/file_permission_native/BUILD.gn @@ -28,7 +28,6 @@ ohos_unittest("file_permission_test") { include_dirs = [ "include", "${app_file_service_path}/tests/mock/file_permission_native/include", - "//third_party/googletest/include", ] sources = [ "${app_file_service_path}/tests/mock/file_permission_native/src/sandbox_mock.cpp", @@ -45,6 +44,8 @@ ohos_unittest("file_permission_test") { "app_file_service:fileshare_native", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", @@ -55,8 +56,4 @@ ohos_unittest("file_permission_test") { external_deps += [ "sandbox_manager:libsandbox_manager_sdk" ] defines += [ "SANDBOX_MANAGER" ] } - deps = [ - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] } diff --git a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn index 5d75c18f5..00f3889f8 100644 --- a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn +++ b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("file_share_permission_ndk_sup_test") { "${app_file_service_path}/interfaces/kits/ndk/fileshare/include", "${app_file_service_path}/tests/mock/file_permission_native_mock/include", "${app_file_service_path}/tests/mock/parameter_mock/include", - "//third_party/googletest/include", ] resource_config_file = "../../resource/ohos_test.xml" sources = [ @@ -47,6 +46,8 @@ ohos_unittest("file_share_permission_ndk_sup_test") { "access_token:libtoken_setproc", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", @@ -54,7 +55,5 @@ ohos_unittest("file_share_permission_ndk_sup_test") { ] deps = [ "${app_file_service_path}/interfaces/innerkits/native:fileshare_native", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] } diff --git a/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn b/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn index 88e9a42ec..4f58905bc 100644 --- a/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn +++ b/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn @@ -28,7 +28,6 @@ ohos_unittest("file_share_permission_ndk_test") { "include", "${app_file_service_path}/interfaces/kits/ndk/fileshare/include", "${app_file_service_path}/interfaces/kits/ndk/fileshare/src", - "//third_party/googletest/include", ] resource_config_file = "../../resource/ohos_test.xml" sources = [ "file_share_permission_test.cpp" ] @@ -41,6 +40,8 @@ ohos_unittest("file_share_permission_ndk_test") { "access_token:libtoken_setproc", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", @@ -49,7 +50,5 @@ ohos_unittest("file_share_permission_ndk_test") { deps = [ "${app_file_service_path}/interfaces/innerkits/native:fileshare_native", "${app_file_service_path}/interfaces/kits/ndk/fileshare/src:ohfileshare", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] } diff --git a/test/unittest/file_uri_native/BUILD.gn b/test/unittest/file_uri_native/BUILD.gn index 447faf2f7..4aadf0640 100644 --- a/test/unittest/file_uri_native/BUILD.gn +++ b/test/unittest/file_uri_native/BUILD.gn @@ -34,13 +34,10 @@ ohos_unittest("file_uri_test") { "app_file_service:fileshare_native", "app_file_service:fileuri_native", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", ] - - deps = [ - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] } diff --git a/test/unittest/file_uri_ndk_test/BUILD.gn b/test/unittest/file_uri_ndk_test/BUILD.gn index 006bc9fa0..4e1ee2bf9 100644 --- a/test/unittest/file_uri_ndk_test/BUILD.gn +++ b/test/unittest/file_uri_ndk_test/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("file_uri_ndk_test") { include_dirs = [ "include", "${app_file_service_path}/interfaces/kits/ndk/fileuri/include", - "//third_party/googletest/include", ] resource_config_file = "../resource/ohos_test.xml" sources = [ "file_uri_ndk_test.cpp" ] @@ -37,11 +36,9 @@ ohos_unittest("file_uri_ndk_test") { "app_file_service:ohfileuri", "c_utils:utils", "file_api:filemgmt_libn", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", ] - deps = [ - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] } diff --git a/test/unittest/remote_file_share/BUILD.gn b/test/unittest/remote_file_share/BUILD.gn index 13ca80d73..e83ece650 100644 --- a/test/unittest/remote_file_share/BUILD.gn +++ b/test/unittest/remote_file_share/BUILD.gn @@ -32,15 +32,14 @@ ohos_unittest("remote_file_share_test") { include_dirs = [ "include", - "../../../interfaces/innerkits/native/remote_file_share/include", - "../../../interfaces/innerkits/native/remote_file_share/src", + "${app_file_service_path}/interfaces/innerkits/native/remote_file_share/include", + "${app_file_service_path}/interfaces/innerkits/native/remote_file_share/src", "${utils_system_safwk_path}/native/include", "${path_base}/include", ] deps = [ - "../../../interfaces/innerkits/native:remote_file_share_native", - "//third_party/googletest:gtest_main", + "${app_file_service_path}/interfaces/innerkits/native:remote_file_share_native" ] external_deps = [ @@ -48,6 +47,8 @@ ohos_unittest("remote_file_share_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn index 1ef532c62..c856cfa25 100644 --- a/tests/unittests/backup_api/backup_impl/BUILD.gn +++ b/tests/unittests/backup_api/backup_impl/BUILD.gn @@ -71,11 +71,12 @@ ohos_unittest("backup_sa_impl_test") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", ] external_deps = [ "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index 849943f24..1145e1840 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -43,7 +43,6 @@ ohos_unittest("ext_extension_test") { deps = [ "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -56,6 +55,8 @@ ohos_unittest("ext_extension_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", @@ -94,14 +95,12 @@ ohos_unittest("ext_extension_stub_test") { "${path_backup}/utils/include", ] - deps = [ - "${path_backup}/utils:backup_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] + deps = [ "${path_backup}/utils:backup_utils" ] external_deps = [ "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", @@ -164,7 +163,6 @@ ohos_unittest("tar_file_test") { "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -182,6 +180,8 @@ ohos_unittest("tar_file_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hitrace:hitrace_meter", "ipc:ipc_core", "napi:ace_napi", @@ -240,7 +240,6 @@ ohos_unittest("untar_file_sup_test") { "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -258,6 +257,8 @@ ohos_unittest("untar_file_sup_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hitrace:hitrace_meter", "ipc:ipc_core", "napi:ace_napi", @@ -313,7 +314,6 @@ ohos_unittest("untar_file_test") { "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -331,6 +331,8 @@ ohos_unittest("untar_file_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hitrace:hitrace_meter", "ipc:ipc_core", "napi:ace_napi", @@ -364,8 +366,6 @@ ohos_unittest("ext_backup_js_test") { deps = [ "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", - "${path_googletest}:gtest_main", "${path_jsoncpp}:jsoncpp", ] @@ -380,6 +380,8 @@ ohos_unittest("ext_backup_js_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 1c9051f27..3f768047e 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -51,7 +51,6 @@ ohos_unittest("module_ipc_test") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "//third_party/googletest:gmock_main", ] external_deps = [ @@ -59,6 +58,8 @@ ohos_unittest("module_ipc_test") { "ability_runtime:ability_manager", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -117,7 +118,6 @@ ohos_unittest("backup_service_test") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -127,6 +127,8 @@ ohos_unittest("backup_service_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -191,7 +193,6 @@ ohos_unittest("backup_service_throw_test") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -201,6 +202,8 @@ ohos_unittest("backup_service_throw_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -259,7 +262,6 @@ ohos_unittest("backup_service_session_test") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -269,6 +271,8 @@ ohos_unittest("backup_service_session_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", @@ -312,7 +316,6 @@ ohos_unittest("backup_service_scheduler_test") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", ] external_deps = [ @@ -321,6 +324,8 @@ ohos_unittest("backup_service_scheduler_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", @@ -375,7 +380,6 @@ ohos_unittest("backup_restore_deps_manager_test") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -385,6 +389,8 @@ ohos_unittest("backup_restore_deps_manager_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/tests/unittests/backup_sa/session/BUILD.gn b/tests/unittests/backup_sa/session/BUILD.gn index 46b847da7..e7ae1a2cf 100644 --- a/tests/unittests/backup_sa/session/BUILD.gn +++ b/tests/unittests/backup_sa/session/BUILD.gn @@ -35,11 +35,7 @@ ohos_unittest("b_incremental_session_test") { "service_proxy_mock.cpp", ] - deps = [ - "${path_backup}/utils:backup_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] + deps = [ "${path_backup}/utils:backup_utils" ] defines = [ "LOG_TAG=\"app_file_service\"", @@ -51,6 +47,8 @@ ohos_unittest("b_incremental_session_test") { external_deps = [ "c_utils:utils", "hilog:libhilog", + "googletest:gmock_main", + "googletest:gtest_main", "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/tests/unittests/backup_tools/BUILD.gn b/tests/unittests/backup_tools/BUILD.gn index 0a0c1d50a..10c781fbc 100644 --- a/tests/unittests/backup_tools/BUILD.gn +++ b/tests/unittests/backup_tools/BUILD.gn @@ -52,7 +52,6 @@ ohos_unittest("backup_tool_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -64,6 +63,8 @@ ohos_unittest("backup_tool_test") { external_deps = [ "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", @@ -114,7 +115,6 @@ ohos_unittest("backup_tool_restore_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] @@ -126,6 +126,8 @@ ohos_unittest("backup_tool_restore_test") { external_deps = [ "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index 47be52ea6..0d0ea30fb 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -124,13 +124,14 @@ ohos_unittest("b_json_test") { "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] external_deps = [ "cJSON:cjson", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", ] @@ -175,11 +176,12 @@ ohos_unittest("b_tarball_cmdline_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_googletest}:gmock_main", ] external_deps = [ "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", ] @@ -207,11 +209,12 @@ ohos_unittest("b_tarball_factory_test") { "${path_backup}/utils/include", ] - deps = [ - "${path_backup}/tests/utils:backup_test_utils", - "${path_googletest}:gmock_main", + deps = [ "${path_backup}/tests/utils:backup_test_utils" ] + external_deps = [ + "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] use_exceptions = true } @@ -267,13 +270,14 @@ ohos_unittest("b_json_other_test") { "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] external_deps = [ "cJSON:cjson", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", ] diff --git a/tests/utils/BUILD.gn b/tests/utils/BUILD.gn index 6c2f38192..ca63cd1ca 100644 --- a/tests/utils/BUILD.gn +++ b/tests/utils/BUILD.gn @@ -36,11 +36,12 @@ ohos_static_library("backup_test_utils") { public_configs = [ ":test_util_public_config" ] - deps = [ - "${path_backup}/utils:backup_utils", - "${path_googletest}:gmock_main", + deps = [ "${path_backup}/utils:backup_utils" ] + external_deps = [ + "googletest:gmock_main", + "googletest:gtest_main", + "hilog:libhilog", ] - external_deps = [ "hilog:libhilog" ] use_exceptions = true part_name = "app_file_service" subsystem_name = "filemanagement" -- Gitee