From 94d8abe2e2935fffd5a58cf4249b0e9e1027b49f Mon Sep 17 00:00:00 2001 From: lijunru Date: Sat, 12 Aug 2023 08:18:13 +0800 Subject: [PATCH] common component rectification Signed-off-by: lijunru Change-Id: Ieb9ee75cd48b4adbb2df07c95d578867d78172ca --- arkui/libuv/BUILD.gn | 2 ++ arkui/libuv/cplibuv.sh | 2 +- graphic/vkgl/cpvkgl.sh | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arkui/libuv/BUILD.gn b/arkui/libuv/BUILD.gn index 2b3a84d29..e2917d64b 100644 --- a/arkui/libuv/BUILD.gn +++ b/arkui/libuv/BUILD.gn @@ -208,6 +208,8 @@ ohos_executable("libuvruntest") { ] sources = [ "//third_party/libuv/test/run-tests.c" ] deps = [ ":libuvTestStatic" ] + part_name = "libuv" + subsystem_name = "thirdparty" } ohos_moduletest_suite("ActsLibuvTest") { diff --git a/arkui/libuv/cplibuv.sh b/arkui/libuv/cplibuv.sh index 8edf2b762..f7bcb6bb3 100755 --- a/arkui/libuv/cplibuv.sh +++ b/arkui/libuv/cplibuv.sh @@ -17,5 +17,5 @@ set -e root_libuv_path=$1 mkdir -p "suites/acts/testcases/libuvdata/test" cp -rf "$root_libuv_path/test/xts/acts/arkui/libuv/genlocal.py" "suites/acts/testcases/libuvdata" -cp -rf "common/common/libuvruntest" "suites/acts/testcases/libuvdata" +cp -rf "thirdparty/libuv/libuvruntest" "suites/acts/testcases/libuvdata" cp -rf "$root_libuv_path/third_party/libuv/test/fixtures" "suites/acts/testcases/libuvdata/test" diff --git a/graphic/vkgl/cpvkgl.sh b/graphic/vkgl/cpvkgl.sh index b012dd9de..f2d710a6c 100755 --- a/graphic/vkgl/cpvkgl.sh +++ b/graphic/vkgl/cpvkgl.sh @@ -20,7 +20,7 @@ cp -rf "$root_vkgl_path/third_party/vk-gl-cts/data" "suites/acts/testcases/vkgld cp -rf "$root_vkgl_path/third_party/vk-gl-cts/external/openglcts/data" "suites/acts/testcases/vkgldata" tar czvf "vkgldata.tar.gz" -C "suites/acts/testcases/vkgldata" "." mv "vkgldata.tar.gz" "suites/acts/testcases/vkgldata" -cp -rf "common/common/libdeqp_ohos_platform.z.so" "suites/acts/testcases/vkgldata" -cp -rf "common/common/librosen_context.z.so" "suites/acts/testcases/vkgldata" +cp -rf "graphic/graphic_2d/libdeqp_ohos_platform.z.so" "suites/acts/testcases/vkgldata" +cp -rf "graphic/graphic_2d/librosen_context.z.so" "suites/acts/testcases/vkgldata" cp -rf "graphic/graphic_2d/libdeqp_spirv.z.so" "suites/acts/testcases/vkgldata" -cp -rf "graphic/graphic_2d/libdeqp_spvremapper.z.so" "suites/acts/testcases/vkgldata" \ No newline at end of file +cp -rf "graphic/graphic_2d/libdeqp_spvremapper.z.so" "suites/acts/testcases/vkgldata" -- GitLab