diff --git a/thirdparty/libwtf/HPKBUILD b/thirdparty/libwtf/HPKBUILD index d021645c8e930bf275fd60a8d22f173958a8fb5b..4ca437cf228e18cacc172f8cc204fe44a8fbc482 100644 --- a/thirdparty/libwtf/HPKBUILD +++ b/thirdparty/libwtf/HPKBUILD @@ -40,7 +40,8 @@ prepare() { patch -p1 < `pwd`/../JavaScriptCore_oh_pkg.patch # 修改因平台差异导致char类型符号位差异,而引起相关测试用例报错 patch -p1 < `pwd`/../JavaScriptCore_oh_test.patch - + # 不能访问的/tmp 修改为 /data/local/tmp + patch -p1 < ../libwtf_ohos_test.patch # patch只需要打一次,关闭打patch patchflag=false cd $OLDPWD diff --git a/thirdparty/libwtf/HPKCHECK b/thirdparty/libwtf/HPKCHECK index 131b6e939b34b99f39665d6b838646789eb34438..965c6c611ea8e5de1fb15db6242ad3096d48846e 100644 --- a/thirdparty/libwtf/HPKCHECK +++ b/thirdparty/libwtf/HPKCHECK @@ -18,12 +18,8 @@ logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_ openharmonycheck() { res=0 cd ${builddir}/${ARCH}-build - # 拷贝自动化测试需要的so文件 - mkdir -p /usr/local/lib/libwtf - cp ${LYCIUM_ROOT}/../lycium/usr/icu/arm64-v8a/lib/* /usr/local/lib/libwtf/ - cp ./lib/libgtest.so /usr/local/lib/libwtf/ - export LD_LIBRARY_PATH=/usr/local/lib/libwtf:$LD_LIBRARY_PATH - # 测试前注意时区改为GMT-07:00,否则会夏令时检测会不通过 + # 测试所需的gtest.so 需要额外导出 + export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH ctest > ${logfile} 2>&1 res=$? if [ $res -ne 0 ] diff --git a/thirdparty/libwtf/libwtf_ohos_test.patch b/thirdparty/libwtf/libwtf_ohos_test.patch new file mode 100644 index 0000000000000000000000000000000000000000..dfde361f3c2f0cc0d9455b4d2054bd35df93a348 --- /dev/null +++ b/thirdparty/libwtf/libwtf_ohos_test.patch @@ -0,0 +1,12 @@ +diff -Nura WebKit-webkitgtk-2.41.90/Source/ThirdParty/gtest/src/gtest-port.cc WebKit-webkitgtk-2.41.90_patchdir/Source/ThirdParty/gtest/src/gtest-port.cc +--- WebKit-webkitgtk-2.41.90/Source/ThirdParty/gtest/src/gtest-port.cc 2023-08-10 13:57:48.000000000 +0800 ++++ WebKit-webkitgtk-2.41.90_patchdir/Source/ThirdParty/gtest/src/gtest-port.cc 2024-08-14 20:00:55.750636944 +0800 +@@ -1112,7 +1112,7 @@ + // guaranteed to be mounted, or may have a delay in mounting. + char name_template[] = "/data/local/tmp/gtest_captured_stream.XXXXXX"; + # else +- char name_template[] = "/tmp/captured_stream.XXXXXX"; ++ char name_template[] = "/data/local/tmp/captured_stream.XXXXXX"; + # endif // GTEST_OS_LINUX_ANDROID + const int captured_fd = mkstemp(name_template); + if (captured_fd == -1) { \ No newline at end of file