未验证 提交 40fd9b2c 编写于 作者: O openharmony_ci 提交者: Gitee

!7670 修改vkgl与libuv绝对路径问题

Merge pull request !7670 from jiyong/master
...@@ -226,6 +226,8 @@ action("cpLibuv") { ...@@ -226,6 +226,8 @@ action("cpLibuv") {
testonly = true testonly = true
script = "cplibuv.sh" script = "cplibuv.sh"
outputs = [ "${target_out_dir}/cplibuv.log" ] outputs = [ "${target_out_dir}/cplibuv.log" ]
root_libuv_path = rebase_path("//")
args = [ "$root_libuv_path" ]
deps = [ deps = [
":ActsLibuvTest", ":ActsLibuvTest",
":libuvruntest", ":libuvruntest",
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
# limitations under the License. # limitations under the License.
set -e set -e
root_libuv_path=$1
mkdir -p "suites/acts/testcases/libuvdata/test" mkdir -p "suites/acts/testcases/libuvdata/test"
cp -rf "../../test/xts/acts/arkui/libuv/genlocal.py" "suites/acts/testcases/libuvdata" 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 "common/common/libuvruntest" "suites/acts/testcases/libuvdata"
cp -rf "../../third_party/libuv/test/fixtures" "suites/acts/testcases/libuvdata/test" cp -rf "$root_libuv_path/third_party/libuv/test/fixtures" "suites/acts/testcases/libuvdata/test"
...@@ -155,6 +155,8 @@ action("cpvkgl") { ...@@ -155,6 +155,8 @@ action("cpvkgl") {
testonly = true testonly = true
script = "cpvkgl.sh" script = "cpvkgl.sh"
outputs = [ "${target_out_dir}/cpvkgl.log" ] outputs = [ "${target_out_dir}/cpvkgl.log" ]
root_vkgl_path = rebase_path("//")
args = [ "$root_vkgl_path" ]
deps = [ deps = [
":VKGLCTSTest", ":VKGLCTSTest",
"//third_party/vk-gl-cts/framework/platform:glcts", "//third_party/vk-gl-cts/framework/platform:glcts",
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
# limitations under the License. # limitations under the License.
set -e set -e
root_vkgl_path=$1
mkdir -p "suites/acts/testcases/vkgldata" mkdir -p "suites/acts/testcases/vkgldata"
cp -rf "../../third_party/vk-gl-cts/data" "suites/acts/testcases/vkgldata" cp -rf "$root_vkgl_path/third_party/vk-gl-cts/data" "suites/acts/testcases/vkgldata"
cp -rf "../../third_party/vk-gl-cts/external/openglcts/data" "suites/acts/testcases/vkgldata" 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" "." tar czvf "vkgldata.tar.gz" -C "suites/acts/testcases/vkgldata" "."
mv "vkgldata.tar.gz" "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/libdeqp_ohos_platform.z.so" "suites/acts/testcases/vkgldata"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册