From 87ec6730189ad8711df0a6a1527304e1b11ff3cd Mon Sep 17 00:00:00 2001 From: bWX1145125 Date: Wed, 16 Oct 2024 15:53:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E4=BE=8B=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bWX1145125 --- distributedhardware/BUILD.gn | 4 ++-- distributedhardware/distributedcameratest/BUILD.gn | 4 ++-- distributedhardware/distributedcameratest/Test.json | 4 ++-- hdf/camera/cameraMg/BUILD.gn | 4 ++-- hdf/camera/cameraMg/v1_0/BUILD.gn | 2 +- hdf/camera/cameraMg/v1_0/Test.json | 6 +++--- kernel/BUILD.gn | 4 ++-- kernel/purgeableMem/BUILD.gn | 2 +- kernel/purgeableMem/Test.json | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/distributedhardware/BUILD.gn b/distributedhardware/BUILD.gn index 721df112..37337869 100644 --- a/distributedhardware/BUILD.gn +++ b/distributedhardware/BUILD.gn @@ -18,11 +18,11 @@ group("distributedhardware") { if (is_standard_system) { if (hats_rich == false) { deps = [ - "distributedcameratest:HatsdisCameraProviderCase", + "distributedcameratest:HatsdisCameraProviderCaseTest", "distributedcameratest_additional:HatsdisCameraProviderCaseAdditionalTest", ] } else { - deps = [ "distributedcameratest:HatsdisCameraProviderCase" ] + deps = [ "distributedcameratest:HatsdisCameraProviderCaseTest" ] } } } diff --git a/distributedhardware/distributedcameratest/BUILD.gn b/distributedhardware/distributedcameratest/BUILD.gn index b74674cc..6072103d 100644 --- a/distributedhardware/distributedcameratest/BUILD.gn +++ b/distributedhardware/distributedcameratest/BUILD.gn @@ -19,7 +19,7 @@ config("dcamera_hdf_demo_config") { visibility = [ ":*" ] } -ohos_moduletest_suite("HatsdisCameraProviderCase") { +ohos_moduletest_suite("HatsdisCameraProviderCaseTest") { module_out_path = module_output_path install_enable = true sources = [ "dcameraprovidercase.cpp" ] @@ -87,7 +87,7 @@ ohos_moduletest_suite("HatsdisCameraProviderCase") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraHdfCase\"", + "DH_LOG_TAG=\"HatsdisCameraProviderCaseTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/distributedhardware/distributedcameratest/Test.json b/distributedhardware/distributedcameratest/Test.json index 2d479686..526f794b 100644 --- a/distributedhardware/distributedcameratest/Test.json +++ b/distributedhardware/distributedcameratest/Test.json @@ -1,7 +1,7 @@ { "description": "Config for disSreen test cases", "driver": { - "module-name": "HatsdisCameraProviderCase", + "module-name": "HatsdisCameraProviderCaseTest", "native-test-timeout": "120000", "native-test-device-path": "/data/local/tmp", "runtime-hint": "1s", @@ -13,7 +13,7 @@ "chmod -R 777 /data/local/tmp/*" ], "push": [ - "HatsdisCameraProviderCase->/data/local/tmp/HatsdisCameraProviderCase" + "HatsdisCameraProviderCaseTest->/data/local/tmp/HatsdisCameraProviderCaseTest" ], "type": "PushKit" } diff --git a/hdf/camera/cameraMg/BUILD.gn b/hdf/camera/cameraMg/BUILD.gn index 2463f2dd..ec7ba2df 100644 --- a/hdf/camera/cameraMg/BUILD.gn +++ b/hdf/camera/cameraMg/BUILD.gn @@ -22,10 +22,10 @@ group("HatsHdfCameraMgTest") { } if (is_standard_system) { if (hats_rich == false) { - deps = [ "v1_0:HatsHdfCameraMgTestv0" ] + deps = [ "v1_0:HatsHdfCameraMgv0Test" ] } else { deps = [ - "v1_0:HatsHdfCameraMgTestv0", + "v1_0:HatsHdfCameraMgv0Test", "v1_1:HatsHdfCameraMgTestv1", "v1_2:HatsHdfCameraMgTestv2", "v1_3:HatsHdfCameraMgTestv3", diff --git a/hdf/camera/cameraMg/v1_0/BUILD.gn b/hdf/camera/cameraMg/v1_0/BUILD.gn index 8b0ce6fa..0b0e2a12 100644 --- a/hdf/camera/cameraMg/v1_0/BUILD.gn +++ b/hdf/camera/cameraMg/v1_0/BUILD.gn @@ -20,7 +20,7 @@ import("$base_root/drivers/peripheral/camera/camera.gni") import("$base_root/drivers/peripheral/display/display_config.gni") module_output_path = "hats/camera" -ohos_moduletest_suite("HatsHdfCameraMgTestv0") { +ohos_moduletest_suite("HatsHdfCameraMgv0Test") { #testonly = true defines = [] defines += display_defines diff --git a/hdf/camera/cameraMg/v1_0/Test.json b/hdf/camera/cameraMg/v1_0/Test.json index f32e6dfb..d52d7601 100644 --- a/hdf/camera/cameraMg/v1_0/Test.json +++ b/hdf/camera/cameraMg/v1_0/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "HatsHdfCameraMgTestv0->/data/local/tmp/HatsHdfCameraMgTestv0" + "HatsHdfCameraMgv0Test->/data/local/tmp/HatsHdfCameraMgv0Test" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "HatsHdfCameraMgTestv0", + "module-name": "HatsHdfCameraMgv0Test", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for HatsHdfCameraMgTestv0 Tests" + "description": "Configuration for HatsHdfCameraMgv0Test Tests" } \ No newline at end of file diff --git a/kernel/BUILD.gn b/kernel/BUILD.gn index a8e641bc..384d2868 100644 --- a/kernel/BUILD.gn +++ b/kernel/BUILD.gn @@ -31,7 +31,7 @@ group("kernel") { "open_posix_testsuite/conformance/interfaces_gn:${posix_interface_module}", "posix_interface/interface_gn:HatsPosixInterfaceTest", "prctl:HatsPrctlTest", - "purgeableMem:HatsPurgeable", + "purgeableMem:HatsPurgeableTest", "rtginterface:HatsRtgInterfaceTest", "syscalls:HatsSyscallTest", ] @@ -47,7 +47,7 @@ group("kernel") { "open_posix_testsuite/conformance/interfaces_gn:${posix_interface_module}", "posix_interface/interface_gn:HatsPosixInterfaceTest", "prctl:HatsPrctlTest", - "purgeableMem:HatsPurgeable", + "purgeableMem:HatsPurgeableTest", "rtginterface:HatsRtgInterfaceTest", "syscalls:HatsSyscallTest", ] diff --git a/kernel/purgeableMem/BUILD.gn b/kernel/purgeableMem/BUILD.gn index 2de50829..fde60b66 100644 --- a/kernel/purgeableMem/BUILD.gn +++ b/kernel/purgeableMem/BUILD.gn @@ -15,7 +15,7 @@ import("../../../tools/build/suite.gni") module_output_path = "hats/purgeableMem" -ohos_moduletest_suite("HatsPurgeable") { +ohos_moduletest_suite("HatsPurgeableTest") { module_out_path = module_output_path sources = [ "./purgeable_cpp_test.cpp" ] external_deps = [ diff --git a/kernel/purgeableMem/Test.json b/kernel/purgeableMem/Test.json index 7bdaf6eb..74bf4d0c 100644 --- a/kernel/purgeableMem/Test.json +++ b/kernel/purgeableMem/Test.json @@ -1,9 +1,9 @@ { - "description": "Configuration for HatsPurgeable Tests", + "description": "Configuration for HatsPurgeableTest Tests", "kits": [ { "push": [ - "HatsPurgeable->/data/local/tmp/HatsPurgeable" + "HatsPurgeableTest->/data/local/tmp/HatsPurgeableTest" ], "type": "PushKit" } @@ -11,7 +11,7 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "HatsPurgeable", + "module-name": "HatsPurgeableTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }