!6 remove modify-test-err.patch
From: @caodongxia Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot
Gitee
commit
0ab8b3bc28
@ -2,7 +2,7 @@
|
||||
|
||||
Name: fontconfig
|
||||
Version: 2.13.92
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Fontconfig is a library for configuring and customizing font access
|
||||
License: MIT and Public Domain and UCD
|
||||
URL: http://fontconfig.org
|
||||
@ -19,7 +19,6 @@ Patch6005: fontconfig-fix-test.patch
|
||||
Patch6006: fontconfig-fix-assertion.patch
|
||||
Patch6007: fontconfig-fix-dtd.patch
|
||||
Patch6008: fontconfig-fix-dtd-id.patch
|
||||
Patch9000: modify-test-err.patch
|
||||
|
||||
BuildRequires: libxml2-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel
|
||||
BuildRequires: autoconf automake libtool gettext itstool gperf
|
||||
@ -129,6 +128,9 @@ HOME=/root /usr/bin/fc-cache -s
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 26 2021 caodongxia<caodongxia@huawei.com> - 2.13.92-2
|
||||
- Remove modify-test-err.patch
|
||||
|
||||
* Fri Jun 12 2020 hwx930847<hanhui15@huawei.com> - 2.13.92-1
|
||||
- Type:requirement
|
||||
- Id:NA
|
||||
|
||||
@ -1,224 +0,0 @@
|
||||
diff --git a/test/run-test.sh b/test/run-test.sh
|
||||
index 5faa4fc..8b9d709 100644
|
||||
--- a/test/run-test.sh
|
||||
+++ b/test/run-test.sh
|
||||
@@ -83,17 +82,11 @@ export FONTCONFIG_FILE
|
||||
dotest "Basic check"
|
||||
prep
|
||||
cp $FONT1 $FONT2 $FONTDIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR
|
||||
-fi
|
||||
check
|
||||
|
||||
dotest "With a subdir"
|
||||
prep
|
||||
cp $FONT1 $FONT2 $FONTDIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR
|
||||
-fi
|
||||
$FCCACHE $FONTDIR
|
||||
check
|
||||
|
||||
@@ -101,9 +94,6 @@ dotest "Subdir with a cache file"
|
||||
prep
|
||||
mkdir $FONTDIR/a
|
||||
cp $FONT1 $FONT2 $FONTDIR/a
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR/a
|
||||
-fi
|
||||
$FCCACHE $FONTDIR/a
|
||||
check
|
||||
|
||||
@@ -114,52 +104,13 @@ mkdir $FONTDIR/a/a
|
||||
mkdir $FONTDIR/b
|
||||
mkdir $FONTDIR/b/a
|
||||
cp $FONT1 $FONTDIR/a
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR/a
|
||||
-fi
|
||||
cp $FONT2 $FONTDIR/b/a
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR/b/a
|
||||
-fi
|
||||
-check
|
||||
-
|
||||
-dotest "Subdir with an out-of-date cache file"
|
||||
-prep
|
||||
-mkdir $FONTDIR/a
|
||||
-$FCCACHE $FONTDIR/a
|
||||
-sleep 1
|
||||
-cp $FONT1 $FONT2 $FONTDIR/a
|
||||
-check
|
||||
-
|
||||
-dotest "Dir with an out-of-date cache file"
|
||||
-prep
|
||||
-cp $FONT1 $FONTDIR
|
||||
-$FCCACHE $FONTDIR
|
||||
-sleep 1
|
||||
-mkdir $FONTDIR/a
|
||||
-cp $FONT2 $FONTDIR/a
|
||||
check
|
||||
|
||||
-dotest "Keep mtime of the font directory"
|
||||
-prep
|
||||
-cp $FONT1 $FONTDIR
|
||||
-touch -d @0 $FONTDIR
|
||||
-stat $FONTDIR | grep Modify > out1
|
||||
-$FCCACHE $FONTDIR
|
||||
-stat $FONTDIR | grep Modify > out2
|
||||
-if cmp out1 out2 > /dev/null ; then : ; else
|
||||
- echo "*** Test failed: $TEST"
|
||||
- echo "mtime was modified"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
if [ x"$BWRAP" != "x" -a "x$EXEEXT" = "x" ]; then
|
||||
dotest "Basic functionality with the bind-mounted cache dir"
|
||||
prep
|
||||
cp $FONT1 $FONT2 $FONTDIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR
|
||||
-fi
|
||||
$FCCACHE $FONTDIR
|
||||
sleep 1
|
||||
ls -l $CACHEDIR > out1
|
||||
@@ -199,9 +150,6 @@ rm -rf $TESTTMPDIR out1 out2 xxx flist1 flist2 bind-fonts.conf
|
||||
dotest "Different directory content between host and sandbox"
|
||||
prep
|
||||
cp $FONT1 $FONTDIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR
|
||||
-fi
|
||||
$FCCACHE $FONTDIR
|
||||
sleep 1
|
||||
ls -1 --color=no $CACHEDIR/*cache*> out1
|
||||
@@ -209,9 +157,6 @@ stat -c '%n %s %y %z' `cat out1` > stat1
|
||||
TESTTMPDIR=`mktemp -d /tmp/fontconfig.XXXXXXXX`
|
||||
TESTTMP2DIR=`mktemp -d /tmp/fontconfig.XXXXXXXX`
|
||||
cp $FONT2 $TESTTMP2DIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $TESTTMP2DIR
|
||||
-fi
|
||||
sed "s!@FONTDIR@!$TESTTMPDIR/fonts</dir><dir salt="'"'"salt-to-make-different"'"'">$FONTDIR!
|
||||
s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
|
||||
s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < $TESTDIR/fonts.conf.in > bind-fonts.conf
|
||||
@@ -252,9 +197,6 @@ dotest "Check consistency of MD5 in cache name"
|
||||
prep
|
||||
mkdir -p $FONTDIR/sub
|
||||
cp $FONT1 $FONTDIR/sub
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR/sub
|
||||
-fi
|
||||
$FCCACHE $FONTDIR
|
||||
sleep 1
|
||||
(cd $CACHEDIR; ls -1 --color=no *cache*) > out1
|
||||
@@ -279,9 +221,6 @@ rm -rf $TESTTMPDIR out1 out2 bind-fonts.conf
|
||||
dotest "Fallback to uuid"
|
||||
prep
|
||||
cp $FONT1 $FONTDIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR
|
||||
-fi
|
||||
touch -d @`stat -c %Y $FONTDIR` $FONTDIR
|
||||
$FCCACHE $FONTDIR
|
||||
sleep 1
|
||||
@@ -322,9 +261,6 @@ mkdir -p $MyPWD/sysroot/$FONTDIR
|
||||
mkdir -p $MyPWD/sysroot/$CACHEDIR
|
||||
mkdir -p $MyPWD/sysroot/$MyPWD
|
||||
cp $FONT1 $MyPWD/sysroot/$FONTDIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $MyPWD/sysroot/$FONTDIR
|
||||
-fi
|
||||
cp $MyPWD/fonts.conf $MyPWD/sysroot/$MyPWD/fonts.conf
|
||||
$FCCACHE -y $MyPWD/sysroot
|
||||
|
||||
@@ -341,85 +277,6 @@ fi
|
||||
|
||||
rm -rf $MyPWD/sysroot
|
||||
|
||||
-dotest "read newer caches when multiple places are allowed to store"
|
||||
-prep
|
||||
-cp $FONT1 $FONT2 $FONTDIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR
|
||||
-fi
|
||||
-MYCACHEBASEDIR=`mktemp -d /tmp/fontconfig.XXXXXXXX`
|
||||
-MYCACHEDIR=$MYCACHEBASEDIR/cache.dir
|
||||
-MYOWNCACHEDIR=$MYCACHEBASEDIR/owncache.dir
|
||||
-MYCONFIG=`mktemp /tmp/fontconfig.XXXXXXXX`
|
||||
-
|
||||
-mkdir -p $MYCACHEDIR
|
||||
-mkdir -p $MYOWNCACHEDIR
|
||||
-
|
||||
-sed "s!@FONTDIR@!$FONTDIR!
|
||||
-s!@REMAPDIR@!!
|
||||
-s!@CACHEDIR@!$MYCACHEDIR!" < $TESTDIR/fonts.conf.in > my-fonts.conf
|
||||
-
|
||||
-FONTCONFIG_FILE=$MyPWD/my-fonts.conf $FCCACHE $FONTDIR
|
||||
-
|
||||
-sleep 1
|
||||
-cat<<EOF>$MYCONFIG
|
||||
-<fontconfig>
|
||||
- <match target="scan">
|
||||
- <test name="file"><string>$FONTDIR/4x6.pcf</string></test>
|
||||
- <edit name="pixelsize"><int>8</int></edit>
|
||||
- </match>
|
||||
-</fontconfig>
|
||||
-EOF
|
||||
-sed "s!@FONTDIR@!$FONTDIR!
|
||||
-s!@REMAPDIR@!<include ignore_missing=\"yes\">$MYCONFIG</include>!
|
||||
-s!@CACHEDIR@!$MYOWNCACHEDIR!" < $TESTDIR/fonts.conf.in > my-fonts.conf
|
||||
-
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- old_epoch=${SOURCE_DATE_EPOCH}
|
||||
- SOURCE_DATE_EPOCH=`expr $SOURCE_DATE_EPOCH + 1`
|
||||
-fi
|
||||
-FONTCONFIG_FILE=$MyPWD/my-fonts.conf $FCCACHE -f $FONTDIR
|
||||
-if [ -n ${SOURCE_DATE_EPOCH:-} ]; then
|
||||
- SOURCE_DATE_EPOCH=${old_epoch}
|
||||
-fi
|
||||
-
|
||||
-sed "s!@FONTDIR@!$FONTDIR!
|
||||
-s!@REMAPDIR@!<include ignore_missing=\"yes\">$MYCONFIG</include>!
|
||||
-s!@CACHEDIR@!$MYCACHEDIR</cachedir><cachedir>$MYOWNCACHEDIR!" < $TESTDIR/fonts.conf.in > my-fonts.conf
|
||||
-
|
||||
-FONTCONFIG_FILE=$MyPWD/my-fonts.conf $FCLIST - family pixelsize | sort > my-out
|
||||
-echo "=" >> my-out
|
||||
-FONTCONFIG_FILE=$MyPWD/my-fonts.conf $FCLIST - family pixelsize | sort >> my-out
|
||||
-echo "=" >> my-out
|
||||
-FONTCONFIG_FILE=$MyPWD/my-fonts.conf $FCLIST - family pixelsize | sort >> my-out
|
||||
-tr -d '\015' <my-out >my-out.tmp; mv my-out.tmp my-out
|
||||
-sed -e 's/pixelsize=6/pixelsize=8/g' $BUILDTESTDIR/$EXPECTED > my-out.expected
|
||||
-
|
||||
-if cmp my-out my-out.expected > /dev/null ; then : ; else
|
||||
- echo "*** Test failed: $TEST"
|
||||
- echo "*** output is in 'my-out', expected output in 'my-out.expected'"
|
||||
- echo "Actual Result"
|
||||
- cat my-out
|
||||
- echo "Expected Result"
|
||||
- cat my-out.expected
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-rm -rf $MYCACHEBASEDIR $MYCONFIG my-fonts.conf my-out my-out.expected
|
||||
-
|
||||
fi # if [ "x$EXEEXT" = "x" ]
|
||||
|
||||
-if [ -x $BUILDTESTDIR/test-crbug1004254 ] && [ 0 -eq 1 ]; then
|
||||
- dotest "MT-safe global config"
|
||||
- prep
|
||||
- curl -s -o $FONTDIR/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
|
||||
- (cd $FONTDIR; unzip noto.zip)
|
||||
- if [ -n ${SOURCE_DATE_EPOCH:-} ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
|
||||
- touch -m -t "`date -d \"@${SOURCE_DATE_EPOCH}\" +%y%m%d%H%M.%S`" $FONTDIR
|
||||
- fi
|
||||
- $BUILDTESTDIR/test-crbug1004254
|
||||
-else
|
||||
- echo "No test-crbug1004254: skipped"
|
||||
-fi
|
||||
-
|
||||
rm -rf $FONTDIR $CACHEFILE $CACHEDIR $BASEDIR $FONTCONFIG_FILE out
|
||||
--
|
||||
2.23.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user