diff --git a/community/openssl_1_1_1w/HPKBUILD b/community/openssl_1_1_1w/HPKBUILD index 010dcdc232a3290cfd686a68ea7d7e5de6fe7497..d8146ec16c5c083a8679d0b63c0d64620b7dd0e5 100644 --- a/community/openssl_1_1_1w/HPKBUILD +++ b/community/openssl_1_1_1w/HPKBUILD @@ -43,7 +43,7 @@ prepare() { then cd $builddir # 屏蔽测试bug - patch -p1 < `pwd`/../openssl_oh_test.patch + patch -p1 < $PKGBUILD_ROOT/openssl_oh_test.patch > $publicbuildlog 2>&1 # patch只需要打一次,关闭打patch patchflag=false cd $OLDPWD @@ -67,8 +67,8 @@ prepare() { build() { cd $builddir/$ARCH-build #依赖zlib的OpenSSL支持使用gzip和deflate压缩算法的HTTPS协议可根据需求开启关闭 - ../Configure "$@" $host zlib > `pwd`/build.log 2>&1 - make -j4 >> `pwd`/build.log 2>&1 + ../Configure "$@" $host zlib > $buildlog 2>&1 + $MAKE VERBOSE=1 >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret @@ -76,13 +76,13 @@ build() { package() { cd $builddir/$ARCH-build - make install >> `pwd`/build.log 2>&1 + $MAKE install VERBOSE=1 >> $buildlog 2>&1 cd $OLDPWD } check() { cd $builddir/$ARCH-build - make depend >> `pwd`/build.log 2>&1 + $MAKE depend VERBOSE=1 >> $buildlog 2>&1 cd $OLDPWD unset host if [ $ARCH == "armeabi-v7a" ] @@ -96,6 +96,7 @@ check() { return -1 fi echo "The test must be on an OpenHarmony device!" + sed -i 's#/usr/bin/perl#/data/CIusr/bin/perl#g' $builddir/$ARCH-build/Makefile # real test CMD # 将编译目录加到 LD_LIBRARY_PATH 环境变量 # make test diff --git a/community/openssl_1_1_1w/HPKCHECK b/community/openssl_1_1_1w/HPKCHECK index e23f46909c038f569780fc871e5c6681bc9dbbb6..afc825abd67fcddba5fd05c225e9133316dc958d 100644 --- a/community/openssl_1_1_1w/HPKCHECK +++ b/community/openssl_1_1_1w/HPKCHECK @@ -15,13 +15,16 @@ # Maintainer: lpzhong <278527840@qq.com> source HPKBUILD > /dev/null 2>&1 -logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname:0:7}/${pkgname:0:7}_${ARCH}_${OHOS_SDK_VER}_test.log +logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log openharmonycheck() { res=0 cd ${builddir}/${ARCH}-build - sed -i "s#usr/bin/perl#perl#g" `grep -rn 'usr/bin/perl'|awk -F':'{print $1}'|sort -u` make test > ${logfile} 2>&1 res=$? + if [ $res -ne 0 ];then + mkdir ${LYCIUM_FAULT_PATH}/${pkgname} + cp ${logfile} ${LYCIUM_FAULT_PATH}/${pkgname}/ + fi cd $OLDPWD return $res