From 43099dd2d9ec6a3c62b8e596f2bd3487ab7daa72 Mon Sep 17 00:00:00 2001 From: David Fan Date: Mon, 29 Apr 2024 15:55:07 +0000 Subject: [PATCH] abattis-cantarell-fonts package is retired on branch c10s for CS-2108 --- .gitignore | 31 --- 31-cantarell-vf.conf | 25 -- 31-cantarell.conf | 25 -- abattis-cantarell-fonts.spec | 263 ------------------ dead.package | 1 + sources | 1 - tests/roles/custom-test-fonts/README.md | 73 ----- .../roles/custom-test-fonts/defaults/main.yml | 7 - .../custom-test-fonts/files/run-family-test | 169 ----------- .../files/run-lang-coverage-test | 252 ----------------- tests/roles/custom-test-fonts/meta/main.yml | 4 - tests/roles/custom-test-fonts/tasks/main.yml | 52 ---- tests/roles/custom-test-fonts/vars/main.yml | 7 - 13 files changed, 1 insertion(+), 909 deletions(-) delete mode 100644 .gitignore delete mode 100644 31-cantarell-vf.conf delete mode 100644 31-cantarell.conf delete mode 100644 abattis-cantarell-fonts.spec create mode 100644 dead.package delete mode 100644 sources delete mode 100644 tests/roles/custom-test-fonts/README.md delete mode 100644 tests/roles/custom-test-fonts/defaults/main.yml delete mode 100755 tests/roles/custom-test-fonts/files/run-family-test delete mode 100755 tests/roles/custom-test-fonts/files/run-lang-coverage-test delete mode 100644 tests/roles/custom-test-fonts/meta/main.yml delete mode 100644 tests/roles/custom-test-fonts/tasks/main.yml delete mode 100644 tests/roles/custom-test-fonts/vars/main.yml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 59a693b..0000000 --- a/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -/cantarell-fonts-0.0.1.tar.bz2 -/cantarell-fonts-0.0.3.tar.bz2 -/cantarell-fonts-0.0.4.tar.bz2 -/cantarell-fonts-0.0.5.tar.bz2 -/cantarell-fonts-0.0.6.tar.bz2 -/cantarell-fonts-0.0.7.tar.xz -/cantarell-fonts-0.0.8.tar.xz -/cantarell-fonts-0.0.9.tar.xz -/cantarell-fonts-0.0.10.tar.xz -/cantarell-fonts-0.0.10.1.tar.xz -/cantarell-fonts-0.0.11.tar.xz -/cantarell-fonts-0.0.12.tar.xz -/cantarell-fonts-0.0.13.tar.xz -/cantarell-fonts-0.0.14.tar.xz -/cantarell-fonts-0.0.15.tar.xz -/cantarell-fonts-0.0.16.tar.xz -/cantarell-fonts-0.0.17.tar.xz -/cantarell-fonts-0.0.17.1.tar.xz -/cantarell-fonts-0.0.17.2.tar.xz -/cantarell-fonts-0.0.18.tar.xz -/cantarell-fonts-0.0.20.1.tar.xz -/cantarell-fonts-0.0.21.tar.xz -/cantarell-fonts-0.0.22.tar.xz -/cantarell-fonts-0.0.23.tar.xz -/cantarell-fonts-0.0.24.tar.xz -/cantarell-fonts-0.0.25.tar.xz -/cantarell-fonts-0.100.tar.xz -/cantarell-fonts-0.101.tar.xz -/cantarell-fonts-0.111.tar.xz -/cantarell-fonts-0.201.tar.xz -/cantarell-fonts-0.301.tar.xz diff --git a/31-cantarell-vf.conf b/31-cantarell-vf.conf deleted file mode 100644 index bbc8600..0000000 --- a/31-cantarell-vf.conf +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - system-ui - - Cantarell - - - - - - Cantarell - - system-ui - - - - diff --git a/31-cantarell.conf b/31-cantarell.conf deleted file mode 100644 index bbc8600..0000000 --- a/31-cantarell.conf +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - system-ui - - Cantarell - - - - - - Cantarell - - system-ui - - - - diff --git a/abattis-cantarell-fonts.spec b/abattis-cantarell-fonts.spec deleted file mode 100644 index a59dce5..0000000 --- a/abattis-cantarell-fonts.spec +++ /dev/null @@ -1,263 +0,0 @@ -Version: 0.301 -Release: 12%{?dist} -URL: https://gitlab.gnome.org/GNOME/cantarell-fonts/ - -%global common_description %{expand: -The Cantarell font family is a contemporary Humanist sans serif -designed for on-screen reading. The fonts were originally designed -by Dave Crossland.} - -%global foundry abattis -%global fontlicense OFL -%global fontlicenses COPYING -%global fontdocs NEWS README.md -%global fontdocsex %{fontlicenses} - -%global fontfamily0 Cantarell -%global fontsummary0 Humanist sans serif font -%global fonts0 prebuilt/Cantarell-*.otf -%global fontsex0 prebuilt/Cantarell-VF.otf -%global fontconfs0 %{SOURCE1} -%global fontdescription1 %{expand: -%{common_description} - -This package contains the non-variable font version of the Cantarell font.} - -%global fontfamily1 Cantarell-VF -%global fontsummary1 Humanist sans serif font (variable) -%global fonts1 prebuilt/Cantarell-VF.otf -%global fontconfs1 %{SOURCE2} -%global fontdescription1 %{expand: -%{common_description} - -This package contains the variable font version of the Cantarell font.} - -Source0: http://download.gnome.org/sources/cantarell-fonts/0.301/cantarell-fonts-%{version}.tar.xz -Source1: 31-cantarell.conf -Source2: 31-cantarell-vf.conf - -BuildRequires: gettext -BuildRequires: meson - -%fontpkg -a - -%prep -%autosetup -n cantarell-fonts-%{version} - -%build -%meson -%meson_build -%fontbuild -a - -%install -%fontinstall -a - -%check -%fontcheck -a - -%fontfiles -a - -%changelog -* Mon Jan 22 2024 Fedora Release Engineering - 0.301-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.301-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.301-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 0.301-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 0.301-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 26 2022 Akira TAGOH - 0.301-7 -- Add a sub-package for variable font, abattis-cantarell-vf-fonts. - Resolves: rhbz#2045012 -- Convert the spec file to the latest font packaging guidelines. - -* Wed Jan 19 2022 Fedora Release Engineering - 0.301-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jan 13 2022 Akira TAGOH - 0.301-5 -- Drop the fontconfig config to change the binding to weak. - This causes a trouble for languages where Cantarell doesn't cover. - Let's simply drop and rely on applications to fallback. - Resolves: rhbz#2013083 - -* Fri Dec 10 2021 Kalev Lember - 0.301-4 -- Update upstream URL - -* Wed Jul 21 2021 Fedora Release Engineering - 0.301-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 0.301-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 5 2021 Kalev Lember - 0.301-1 -- Update to 0.301 - -* Fri Jul 31 2020 Akira TAGOH - 0.201-4 -- Add the substitution rule for system-ui in fontconfig config. - -* Mon Jul 27 2020 Fedora Release Engineering - 0.201-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 0.201-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 14 2020 Kalev Lember - 0.201-1 -- Update to 0.201 - -* Wed Jul 24 2019 Fedora Release Engineering - 0.111-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.111-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Sep 07 2018 Kalev Lember - 0.111-1 -- Update to 0.111 - -* Thu Jul 12 2018 Fedora Release Engineering - 0.101-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Mar 15 2018 Kalev Lember - 0.101-1 -- Update to 0.101 - -* Wed Mar 14 2018 Kalev Lember - 0.100-1 -- Update to 0.100 -- Switch to the meson build system -- Use upstream appdata -- Validate appdata file -- Include fontconfig file in packaging as it's no longer included upstream -- Update package summary and description from appdata -- Many thanks to Parag Nemade for the help - with updating the package! - -* Wed Feb 07 2018 Fedora Release Engineering - 0.0.25-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.0.25-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.0.25-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Aug 19 2016 Kalev Lember - 0.0.25-1 -- Update to 0.0.25 - -* Tue Mar 01 2016 Richard Hughes - 0.0.24-1 -- Update to 0.0.24 - -* Fri Feb 26 2016 Adam Williamson - 0.0.23-1 -- Update to 0.0.23 - -* Wed Feb 17 2016 Richard Hughes - 0.0.22-1 -- Update to 0.0.22 - -* Wed Feb 03 2016 Fedora Release Engineering - 0.0.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 20 2016 Kalev Lember - 0.0.21-1 -- Update to 0.0.21 - -* Mon Jan 11 2016 Kalev Lember - 0.0.20.1-1 -- Update to 0.0.20.1 - -* Mon Nov 02 2015 Kalev Lember - 0.0.18-1 -- Update to 0.0.18 - -* Mon Oct 12 2015 Kalev Lember - 0.0.17.2-1 -- Update to 0.0.17.2 - -* Mon Oct 12 2015 Kalev Lember - 0.0.17.1-1 -- Update to 0.0.17.1 - -* Mon Oct 05 2015 Kalev Lember - 0.0.17-2 -- s: provide anchors for accents - -* Sun Oct 04 2015 Kalev Lember - 0.0.17-1 -- Update to 0.0.17 - -* Tue Sep 08 2015 Kalev Lember - 0.0.16-4 -- Fix 'r' hinting -- Use upstream build system rules when regenerating otf files -- Use license macro - -* Tue Jun 16 2015 Fedora Release Engineering - 0.0.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Nov 17 2014 Pravin Satpute - 0.0.16-2 -- Added metainfo for gnome-software. - -* Tue Sep 23 2014 Kalev Lember - 0.0.16-1 -- Update to 0.0.16 - -* Fri Jun 06 2014 Fedora Release Engineering - 0.0.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Sep 25 2013 Richard Hughes - 0.0.15-1 -- Update to 0.0.15 - -* Fri Aug 23 2013 Kalev Lember - 0.0.14-1 -- Update to 0.0.14 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jun 20 2013 Kalev Lember - 0.0.13-1 -- Update to 0.0.13 - -* Wed Feb 13 2013 Fedora Release Engineering - 0.0.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Dec 20 2012 Kalev Lember - 0.0.12-1 -- Update to 0.0.12 - -* Tue Nov 20 2012 Richard Hughes - 0.0.11-1 -- Update to 0.0.11 - -* Tue Sep 25 2012 Cosimo Cecchi - 0.0.10.1-1 -- Update to 0.0.10.1 - -* Tue Sep 18 2012 Kalev Lember - 0.0.10-1 -- Update to 0.0.10 - -* Wed Jul 18 2012 Fedora Release Engineering - 0.0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jun 11 2012 Richard Hughes - 0.0.9-1 -- Update to 0.0.9 - -* Wed Mar 28 2012 Richard Hughes - 0.0.8-1 -- Update to 0.0.8 - -* Thu Jan 12 2012 Fedora Release Engineering - 0.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Oct 18 2011 Matthias Clasen - 0.0.7-1 -- Update to 0.0.7 - -* Fri Oct 07 2011 Matěj Cepl - 0.0.6-2 -- Making the build EL-6 compatible. - -* Wed Jul 6 2011 Matthias Clasen - 0.0.6-1 -- Update to 0.0.6 - -* Mon Feb 21 2011 Cosimo Cecchi - 0.0.3-1 -- Update to 0.0.3 - -* Fri Feb 18 2011 Cosimo Cecchi - 0.0.1-4 -- Include upstream patch for the fontconfig snippet - -* Wed Feb 09 2011 Fedora Release Engineering - 0.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Feb 8 2011 Stephen Smoogen - 0.0.1-2 -- Fixed to meet review standards - -* Tue Feb 8 2011 Cosimo Cecchi - 0.0.1-1 -- Initial packaging of abattis-cantarell-fonts - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..b005087 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +abattis-cantarell-fonts package is retired on branch c10s for CS-2108 \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index c90e903..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (cantarell-fonts-0.301.tar.xz) = 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02 diff --git a/tests/roles/custom-test-fonts/README.md b/tests/roles/custom-test-fonts/README.md deleted file mode 100644 index 869e1ca..0000000 --- a/tests/roles/custom-test-fonts/README.md +++ /dev/null @@ -1,73 +0,0 @@ -# Ansible role for tests using fontconfig - -Put this role in your `tests.yml` playbook. The playbook will first install -package dependencies listed on playbook on your localhost, then it will proceed -to run testing. You can redefine the following variables: - - * **artifacts**: An artifacts directory on localhost to store logs - * **remote_artifacts**: The directory on the system under test where the logs - are stored. Note: if this variable is left undefined, it will default to - `/tmp/artifacts` - * **required_packages**: A list of prerequisite packages required by tests. - Please note that for Atomic Host, additional packages will be installed - using the `rpm-ostree` command which is affecting the test subject (it's - similar as rebuilding an rpm package to be tested) so this should be used - with caution on only when necessary. - * **path_prefix**: The directory on the system where fonts are installed. - please use one in coverage sub-parameter if having different path_prefix - per sub-packages. - * **package**: The package name to test. this is used to find out fontconfig - config file. please use one in families sub-parameter if having different - config files per sub-packages. - * **coverage**: A list of languages for language coverage tests. - * **families**: A list of family test cases. - -## Language coverage test parameters - -Supporting two types of formats. one is a simple list of languages: - - coverage: - - en - - fr - -Another one is a dictionary that has a language as a key and values as parameters: - - coverage: - en: - ... - fr: - ... - -You can redefine the following variables for dictionary format: - - * **exclude**: A list of font file names to exclude on this testing. this is - useful to avoid unexpected failures on iterating tests when a package has - multiple font files and has different coverages but you need to prevent - testing for few fonts which has different coverages to them. - Please note that the file name is relative to `path_prefix` parameter. also - good to consider using `include` if non-targeted files is more than targeted. - * **include**: A list of font file names to include on this testing. this is - useful to avoid unexpected failures on iterating tests when a pcakge has - multiple font files and has different coverages but you need to prevent - testing for few fonts which has different coverages to them. - Please note that the file name is relative to `path_prefix` parameter. also - good to consider using `exclude` if targeted files is more than non-targeted. - * **name**: The name to store logs. the test script is trying to make an unique - file names to store logs but not perfectly working in some cases. this is - optional parameter to make it unique by yourself. - * **path_prefix**: A list of directory names where fonts are installed on system. - this is optional parameter and tries to obtain the font paths from installed - packages by `required_packages` if not available. - -## Family test parameters - - * **lang**: A language to test family name for. - * **alias**: An alias name to test. - * **family**: A family name to test, which is supposed to be assinged to the alias. - * **package**: The package name to test. this is used to find out fontconfig - config file. this is optional. if not specified here, global `package` - parameter will be used. - * **width**: A width to test. the default value is normal. this is the sort of - workaround to avoid the tricky part of implicit behavior in fontconfig. - If a font doesn't support normal(100) width, a test may fails without this - parameter. diff --git a/tests/roles/custom-test-fonts/defaults/main.yml b/tests/roles/custom-test-fonts/defaults/main.yml deleted file mode 100644 index fe09145..0000000 --- a/tests/roles/custom-test-fonts/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -role_pkgs_req: - - fontconfig - - fontconfig-devel - - pkg-config - - rsync diff --git a/tests/roles/custom-test-fonts/files/run-family-test b/tests/roles/custom-test-fonts/files/run-family-test deleted file mode 100755 index e057448..0000000 --- a/tests/roles/custom-test-fonts/files/run-family-test +++ /dev/null @@ -1,169 +0,0 @@ -#! /bin/bash -efu - -debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi -} - -msg_usage() { - cat <<_EOF_ -Run family test. - -Usage: -$PROG - -Options: --h, --help Display this help and exit --v, --verbose Turn on debug --l, --lang=LANG Test LANG language coverage (default: en) --f, --family=FILE Set a family name supposed to be assigned for alias. --g, --alias=STR Set an alias name. (default: sans-serif) --a, --artifactsdir=DIR Set environment dir to store artifacts --k, --package=NAME Set a package name for fonts. --w, --width=WIDTH Set a width -_EOF_ -} - -PROG="${PROG:-${0##*/}}" -DEBUG="${DEBUG:-}" -OPT_LANG="${OPT_LANG:-en}" -OPT_FAMILY="${OPT_FAMILY:-}" -OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" -OPT_ALIAS="${OPT_ALIAS:-sans-serif}" -OPT_PACKAGE="${OPT_PACKAGE:-}" -OPT_WIDTH="${OPT_WIDTH:-normal}" - -opt=$(getopt -n "$0" --options "hvl:f:t:a:g:k:w:" --longoptions "help,verbose,lang:,family:,test:,artifactsdir:,alias:,package:,width:" -- "$@") -eval set -- "$opt" -while [[ $# -gt 0 ]]; do - case "$1" in - -k|--package) - OPT_PACKAGE="$2" - shift 2 - ;; - -g|--alias) - OPT_ALIAS="$2" - shift 2 - ;; - -a|--artifactsdir) - OPT_ARTIFACTS_DIR="$2" - shift 2 - ;; - -f|--family) - OPT_FAMILY="$2" - shift 2 - ;; - -l|--lang) - OPT_LANG="$2" - shift 2 - ;; - -v|--verbose) - DEBUG="-v" - shift - ;; - -w|--width) - OPT_WIDTH="$2" - shift 2 - ;; - -h|--help) - msg_usage - exit 0 - ;; - --) - shift - ;; - *) - msg_usage - exit 1 - esac -done - -if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_FAMILY" ]; then - echo "Use: $PROG -h for help." - exit 0 -fi - -debug "Alias: $OPT_ALIAS" -debug "Family: $OPT_FAMILY" -debug "Lang: $OPT_LANG" -debug "Artifacts dir: $OPT_ARTIFACTS_DIR" -debug "Package name: $OPT_PACKAGE" -debug "Width: $OPT_WIDTH" -STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}_${OPT_LANG}" | sed -e 's/\//-/g' -e 's/ /-/g') -debug "Log file: $STR_TEST_DASHED.log" - -clean_exit() { - rc=$?; - trap - SIGINT SIGTERM SIGABRT EXIT - echo "Run test $OPT_ALIAS: done. Test's exit code: $rc" - for pid in $(ps -o pid --no-headers --ppid $$); do - if [ -n "$(ps -p $pid -o pid=)" ]; then - kill -s HUP $pid - fi - done - local log_file_name="$STR_TEST_DASHED.log" - local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" - local status - if [[ $rc -eq 127 ]]; then - status="ERROR" - elif grep -q "RESULT: WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "RESULT: FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "RESULT: PASS" "$log_file_path"; then - status="PASS" - elif grep -q "FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "PASS" "$log_file_path"; then - status="PASS" - else - status="ERROR" - fi - echo "$status $OPT_ALIAS" >> "$OPT_ARTIFACTS_DIR/test.log" - mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}" - local results="$OPT_ARTIFACTS_DIR/results.yml" - local result=$(echo $status | tr '[:upper:]' '[:lower:]') - test -f "$results" || echo 'results:' > "$results" - printf '%s\n' '' \ - "- test: $OPT_ALIAS" \ - " result: $result" \ - " logs:" \ - " - ${status}_${log_file_name}" \ - >> "$results" - exit 0 -} -trap clean_exit SIGINT SIGTERM SIGABRT EXIT - -cachedir=`pkg-config --variable cachedir fontconfig` -tmpconfd=`mktemp --tmpdir -d fontsci.XXXXXXXX` -conf=$(for i in `rpm -ql $OPT_PACKAGE | grep conf.d`; do - echo "$i" -done) -cat <<_EOF_> $tmpconfd/fonts.conf - - /usr/share/fonts - $conf - $cachedir - -_EOF_ -debug "Config: `cat $tmpconfd/fonts.conf`" - -mkdir -p "$OPT_ARTIFACTS_DIR" -export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" -logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" -logfile="$(realpath "$logfile")" -exec > >(tee -a "$logfile") 2>&1 - -debug "Check family assignment" -res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-pattern -c -f "%{family}" :family=$OPT_ALIAS:lang=$OPT_LANG:width=$OPT_WIDTH | grep "$OPT_FAMILY"` -ret=0 -if [ "x$res" != "x" ]; then - echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected" -else - echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)" - ret=1 -fi -rm -rf $tmpconfd - -exit $ret diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test deleted file mode 100755 index a0de1fb..0000000 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ /dev/null @@ -1,252 +0,0 @@ -#! /bin/bash -efu - -debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi -} - -msg_usage() { - cat <<_EOF_ -Run language coverage test. - -Usage: -$PROG - -Options: --h, --help Display this help and exit --v, --verbose Turn on debug --l, --lang=LANG Test LANG language coverage (default: en) --p, --path=PATH Test fonts on PATH --k, --package=PACKAGE Specify PACKAGE to obtain some information --n, --name=NAME Set NAME to store a log file. --a, --artifactsdir=DIR test environment dir to store artifacts --e, --exclude=FILE Exclude FILE to check. --i, --include=FILE Include File to check. -_EOF_ -} - -PROG="${PROG:-${0##*/}}" -DEBUG="${DEBUG:-}" -OPT_LANG="${OPT_LANG:-en}" -OPT_PATH=() -OPT_PACKAGE=() -OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" -OPT_EXCLUDE=() -OPT_INCLUDE=() -OPT_NAME="${OPT_NAME:-}" - -opt=$(getopt -n "$0" --options "hvl:p:k:n:a:e:i:" --longoptions "help,verbose,lang:,path:,package:,name:,artifactsdir:,exclude:,include:" -- "$@") -eval set -- "$opt" -while [[ $# -gt 0 ]]; do - case "$1" in - -n|--name) - OPT_NAME="$2" - shift 2 - ;; - -i|--include) - OPT_INCLUDE+=("$2") - shift 2 - ;; - -e|--exclude) - OPT_EXCLUDE+=("$2") - shift 2 - ;; - -a|--artifactsdir) - OPT_ARTIFACTS_DIR="$2" - shift 2 - ;; - -p|--path) - OPT_PATH+=("$2") - shift 2 - ;; - -k|--package) - OPT_PACKAGE+=("$2") - shift 2 - ;; - -l|--lang) - OPT_LANG="$2" - shift 2 - ;; - -v|--verbose) - DEBUG="-v" - shift - ;; - -h|--help) - msg_usage - exit 0 - ;; - --) - shift - ;; - *) - msg_usage - exit 1 - esac -done - -if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ ! -v OPT_PATH ] && [ ! -v OPT_PACKAGE ]; then - echo "Use: $PROG -h for help." - exit 0 -fi - -STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g') - -clean_exit() { - rc=$?; - trap - SIGINT SIGTERM SIGABRT EXIT - echo "Run test $OPT_LANG: done. Test's exit code: $rc" - for pid in $(ps -o pid --no-headers --ppid $$); do - if [ -n "$(ps -p $pid -o pid=)" ]; then - kill -s HUP $pid - fi - done - local log_file_name="$STR_TEST_DASHED.log" - local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" - local status - if [[ $rc -eq 127 ]]; then - status="ERROR" - elif grep -q "RESULT: WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "RESULT: FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "RESULT: PASS" "$log_file_path"; then - status="PASS" - elif grep -q "WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "PASS" "$log_file_path"; then - status="PASS" - else - status="ERROR" - fi - echo "$status $OPT_LANG" >> "$OPT_ARTIFACTS_DIR/test.log" - mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}" - local results="$OPT_ARTIFACTS_DIR/results.yml" - local result=$(echo $status | tr '[:upper:]' '[:lower:]') - test -f "$results" || echo 'results:' > "$results" - printf '%s\n' '' \ - "- test: $OPT_LANG" \ - " result: $result" \ - " logs:" \ - " - ${status}_${log_file_name}" \ - >> "$results" - exit 0 -} -trap clean_exit SIGINT SIGTERM SIGABRT EXIT - -mkdir -p "$OPT_ARTIFACTS_DIR" -export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" -logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" -logfile="$(realpath "$logfile")" -exec > >(tee -a "$logfile") 2>&1 - -for pkg in ${OPT_PACKAGE[@]}; do - if ! rpm -q ${pkg} > /dev/null 2>&1; then - echo "Package isn't installed or maybe a typo: ${pkg}" - exit 127 - fi - d=$(for d in $(rpm -ql ${pkg}|grep /usr/share/fonts); do - dirname $d - done | sort | uniq | grep /usr/share/fonts/) - if [[ ! " ${OPT_PATH[@]} " =~ " ${d} " ]]; then - OPT_PATH+=("$d") - fi -done - -expand_regex() { - local p ret=() - local regex="$1" - shift - debug "Expanding $regex" - for p; do - set +f - debug "$p: $regex" - (cd $p; - local x=$(find -regextype posix-egrep -regex "./$regex" -print|sed -e 's,^\./,,g') - debug "$x" - ret+=($x) - set -f - echo -n ${ret[@]} - ) - done - echo -n ${ret[@]} -} - -iv=() -ev=() -x=() -for p in ${OPT_INCLUDE[@]}; do - x=$(expand_regex $p ${OPT_PATH[@]}) - if [ "x$x" == "x" ]; then - echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?" - continue - fi - iv=("${iv[@]}" "${x[@]}") -done -for p in ${OPT_EXCLUDE[@]}; do - x=$(expand_regex $p ${OPT_PATH[@]}) - if [ "x$x" == "x" ]; then - echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?" - continue - fi - ev=("${ev[@]}" "${x[@]}") -done -OPT_EXCLUDE=(${ev[@]}) -OPT_INCLUDE=(${iv[@]}) - -debug "Path: ${OPT_PATH[@]}" -debug "Lang: $OPT_LANG" -debug "Artifacts dir: $OPT_ARTIFACTS_DIR" -debug "Exclude: ${#OPT_EXCLUDE[@]}: ${OPT_EXCLUDE[@]}" -debug "Include: ${#OPT_INCLUDE[@]}: ${OPT_INCLUDE[@]}" - -contains() { - local e match="$1" - shift - for e; do [[ "$e" == "$match" ]] && return 1; done - return 0 -} - -debug "Check language coverage" -ret=0 -set +f -for p in ${OPT_PATH[@]}; do - for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do - set -f - debug "$i" - if test -f $i; then - n=`basename $i` - set +e - contains "$n" "${OPT_EXCLUDE[@]}" - r=$? - set -e - if [ $r -eq 1 ]; then - debug "ignoring $i" - continue - fi - if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then - set +e - contains "$n" "${OPT_INCLUDE[@]}" - r=$? - set -e - if [ $r -eq 0 ]; then - debug "$i isn't targeted file" - continue - fi - NOT_MATCHED=("${NOT_MATCHED[@]/$n}") - fi - debug " $i" - res=`fc-validate -l $OPT_LANG $i || :` - if echo $res | grep -q Missing; then - echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage." - ret=1 - else - echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage." - fi - fi - done -done - -exit $ret diff --git a/tests/roles/custom-test-fonts/meta/main.yml b/tests/roles/custom-test-fonts/meta/main.yml deleted file mode 100644 index f6d273c..0000000 --- a/tests/roles/custom-test-fonts/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -dependencies: - - role: str-common-init diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml deleted file mode 100644 index ead6a76..0000000 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- - -- block: - - name: language coverage - environment: - LANG: "en_US.UTF-8" - script: run-lang-coverage-test --lang "{{ item }}" {% if path_prefix is defined %} --path {{ path_prefix }} {% elif coverage.values is not defined or coverage[item].path_prefix is not defined %} {% else %} {{ '--path "' + (coverage[item].path_prefix | join('" --path "')) + '"' }} {% endif %} --artifactsdir "{{ remote_artifacts }}" {% if coverage.values is not defined or coverage[item].name is not defined %} {% else %} {{ "--name " + coverage[item].name }} {% endif %} {% if coverage.values is not defined or coverage[item].exclude is not defined %} {% else %} {{ '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"' }} {% endif %} {% if coverage.values is not defined or coverage[item].include is not defined %} {% else %} {{ '--include "' + (coverage[item].include | join('" --include "')) + '"' }} {% endif %} {% if path_prefix is defined or coverage.values is defined and coverage[item].path_prefix is defined %} {% else %} {{ '--package "' + (required_packages|join('" --package "')) + '"' }} {% endif %} - with_items: - - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - - name: generic family assignment - environment: - LANG: "en_US.UTF-8" - when: families is defined - script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }} {% if item.width is defined %} --width {{ item.width }} {% endif %} - with_items: - - "{{ families }}" - - - name: Collect all of failures into one file - shell: | - grep -v PASS "{{ remote_artifacts }}"/FAIL_*.log > "{{ remote_artifacts }}"/FAIL-all.log || : - - - name: Check the results - shell: | - log="{{ remote_artifacts }}/test.log" - if [ ! -f "$log" ]; then - echo ERROR - echo "Test results not found." 1>&2 - elif grep ^ERROR "$log" 1>&2; then - echo ERROR - elif grep ^FAIL "$log" 1>&2; then - echo FAIL - elif grep -q ^PASS "$log"; then - echo PASS - else - echo ERROR - echo "No test results found." 1>&2 - fi - register: test_results - - - name: Set role result - set_fact: - role_result: "{{ test_results.stdout }}" - role_message: "{{ test_results.stderr|d('test execution error.') }}" - role_result_failed: "{{ test_results.stdout != 'PASS' }}" - role_result_msg: "{{ test_results.stderr|d('test execution error.') }}" - - - include_role: - name: str-common-final - - - name: Validate the result - shell: echo "test_results.stdout" - failed_when: test_results.stdout != 'PASS' diff --git a/tests/roles/custom-test-fonts/vars/main.yml b/tests/roles/custom-test-fonts/vars/main.yml deleted file mode 100644 index fe09145..0000000 --- a/tests/roles/custom-test-fonts/vars/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -role_pkgs_req: - - fontconfig - - fontconfig-devel - - pkg-config - - rsync