From a7c1f3c46b84fea1c68387200b2d237da7460e84 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Sat, 28 Nov 2020 12:42:05 +0900 Subject: [PATCH] Disable a test case which requires network connectivity --- ...config-disable-network-required-test.patch | 33 +++++++++++++++++++ fontconfig.spec | 1 + 2 files changed, 34 insertions(+) create mode 100644 fontconfig-disable-network-required-test.patch diff --git a/fontconfig-disable-network-required-test.patch b/fontconfig-disable-network-required-test.patch new file mode 100644 index 0000000..8481f39 --- /dev/null +++ b/fontconfig-disable-network-required-test.patch @@ -0,0 +1,33 @@ +diff -pruN fontconfig-2.13.93.orig/test/run-test.sh fontconfig-2.13.93/test/run-test.sh +--- fontconfig-2.13.93.orig/test/run-test.sh 2020-11-28 10:56:42.000000000 +0900 ++++ fontconfig-2.13.93/test/run-test.sh 2020-11-28 12:39:57.345644527 +0900 +@@ -421,18 +421,18 @@ rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" my- + + fi # if [ "x$EXEEXT" = "x" ] + +-if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; 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 ++#if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; 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 ++#fi + + if [ "x$EXEEXT" = "x" ]; then + diff --git a/fontconfig.spec b/fontconfig.spec index e89c52d..cb4d4ae 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -19,6 +19,7 @@ Source2: fc-cache # https://bugzilla.redhat.com/show_bug.cgi?id=140335 Patch0: %{name}-sleep-less.patch Patch4: %{name}-drop-lang-from-pkgkit-format.patch +Patch5: %{name}-disable-network-required-test.patch BuildRequires: libxml2-devel BuildRequires: freetype-devel >= %{freetype_version}