Compare commits
No commits in common. "c9s" and "c8s" have entirely different histories.
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
|
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
|
||||||
<fontconfig>
|
<fontconfig>
|
||||||
<!-- Microsoft -->
|
<!-- Microsoft -->
|
||||||
<alias binding="same">
|
<alias binding="same">
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
|
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
|
||||||
<fontconfig>
|
<fontconfig>
|
||||||
<alias>
|
<alias>
|
||||||
<family>serif</family>
|
<family>serif</family>
|
202
LICENSE-2.0.txt
202
LICENSE-2.0.txt
@ -1,202 +0,0 @@
|
|||||||
|
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
http://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work.
|
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following
|
|
||||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
||||||
replaced with your own identifying information. (Don't include
|
|
||||||
the brackets!) The text should be enclosed in the appropriate
|
|
||||||
comment syntax for the file format. We also recommend that a
|
|
||||||
file or class name and description of purpose be included on the
|
|
||||||
same "printed page" as the copyright notice for easier
|
|
||||||
identification within third-party archives.
|
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
@ -1,6 +1,6 @@
|
|||||||
--- !Policy
|
--- !Policy
|
||||||
product_versions:
|
product_versions:
|
||||||
- rhel-9
|
- rhel-8
|
||||||
decision_context: osci_compose_gate
|
decision_context: osci_compose_gate
|
||||||
rules:
|
rules:
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||||
|
@ -1,68 +1,70 @@
|
|||||||
|
%global fontname google-crosextra-caladea
|
||||||
|
%global fontconf62 62-%{fontname}
|
||||||
|
%global fontconf30 30-0-%{fontname}
|
||||||
|
|
||||||
%global archivename crosextrafonts-20130214
|
%global archivename crosextrafonts-20130214
|
||||||
|
|
||||||
|
Name: %{fontname}-fonts
|
||||||
Version: 1.002
|
Version: 1.002
|
||||||
Release: 0.15.20130214%{?dist}
|
Release: 0.12.20130214%{?dist}
|
||||||
Epoch: 1
|
Summary: Serif font metric-compatible with Cambria font
|
||||||
URL: http://code.google.com/p/chromium/issues/detail?id=168879
|
|
||||||
|
|
||||||
%global foundry Google Crosextra
|
|
||||||
# License added in font as "otfinfo -i Caladea-Regular.ttf | grep License"
|
# License added in font as "otfinfo -i Caladea-Regular.ttf | grep License"
|
||||||
# also from http://code.google.com/p/chromium/issues/detail?id=280557
|
# also from http://code.google.com/p/chromium/issues/detail?id=280557
|
||||||
%global fontlicense Apache-2.0
|
License: ASL 2.0
|
||||||
%global fontlicenses LICENSE-2.0.txt
|
URL: http://code.google.com/p/chromium/issues/detail?id=168879
|
||||||
|
Source0: http://gsdview.appspot.com/chromeos-localmirror/distfiles/%{archivename}.tar.gz
|
||||||
|
Source1: 30-0-%{fontname}-fontconfig.conf
|
||||||
|
Source2: 62-%{fontname}-fontconfig.conf
|
||||||
|
Source3: %{fontname}.metainfo.xml
|
||||||
|
|
||||||
%global fontfamily Caladea
|
BuildArch: noarch
|
||||||
%global fontsummary Serif font metric-compatible with Cambria font
|
BuildRequires: fontpackages-devel
|
||||||
|
Requires: fontpackages-filesystem
|
||||||
|
|
||||||
%global fonts *.ttf
|
%description
|
||||||
%global fontconfs %{SOURCE1} %{SOURCE2}
|
|
||||||
%global fontdescription %{expand:
|
|
||||||
Caladea is metric-compatible with Cambria font. This font is a serif
|
Caladea is metric-compatible with Cambria font. This font is a serif
|
||||||
typeface family based on Lato.
|
typeface family based on Lato.
|
||||||
}
|
|
||||||
|
|
||||||
Source0: http://gsdview.appspot.com/chromeos-localmirror/distfiles/%{archivename}.tar.gz
|
|
||||||
Source1: 30-0-%{fontpkgname}.conf
|
|
||||||
Source2: 62-%{fontpkgname}.conf
|
|
||||||
Source3: https://www.apache.org/licenses/LICENSE-2.0.txt
|
|
||||||
|
|
||||||
%global fontpkgheader %{expand:
|
|
||||||
Obsoletes: ht-caladea-fonts < 1:1.001-10.20200428git336a529
|
|
||||||
}
|
|
||||||
|
|
||||||
%fontpkg
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{archivename}
|
%setup -q -n %{archivename}
|
||||||
cp -p %{SOURCE3} .
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%fontbuild
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%fontinstall
|
install -m 0755 -d %{buildroot}%{_fontdir}
|
||||||
|
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
|
||||||
|
|
||||||
%check
|
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
|
||||||
%fontcheck
|
%{buildroot}%{_fontconfig_confdir}
|
||||||
|
|
||||||
|
install -m 0644 -p %{SOURCE1} \
|
||||||
|
%{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-fontconfig.conf
|
||||||
|
install -m 0644 -p %{SOURCE2} \
|
||||||
|
%{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-fontconfig.conf
|
||||||
|
|
||||||
|
ln -s %{_fontconfig_templatedir}/%{fontconf30}-fontconfig.conf \
|
||||||
|
%{buildroot}%{_fontconfig_confdir}/%{fontconf30}-fontconfig.conf
|
||||||
|
ln -s %{_fontconfig_templatedir}/%{fontconf62}-fontconfig.conf \
|
||||||
|
%{buildroot}%{_fontconfig_confdir}/%{fontconf62}-fontconfig.conf
|
||||||
|
|
||||||
|
# Add AppStream metadata
|
||||||
|
install -Dm 0644 -p %{SOURCE3} \
|
||||||
|
%{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
|
||||||
|
|
||||||
|
%_font_pkg -f *-%{fontname}-fontconfig.conf *.ttf
|
||||||
|
%doc
|
||||||
|
%{_datadir}/appdata/%{fontname}.metainfo.xml
|
||||||
|
|
||||||
%fontfiles
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Feb 06 2023 Parag Nemade <pnemade AT redhat DOT com> - 1:1.002-0.15.20130214
|
* Wed Nov 27 2019 Parag Nemade <pnemade AT redhat DOT com> - 1.002-0.12.20130214
|
||||||
- Un-retire this package in F38+ (#2162532)
|
- Resolves:rh#1682146 - Added missed CI tests
|
||||||
- Update as per suggestions given in rename package review (#2166813)
|
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.002-0.14.20130214
|
* Wed Nov 27 2019 Parag Nemade <pnemade AT redhat DOT com> - 1.002-0.11.20130214
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Resolves:rh#1682146 - Added CI tests
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.002-0.13.20130214
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.002-0.12.20130214
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.002-0.11.20130214
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.002-0.10.20130214
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.002-0.10.20130214
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
17
google-crosextra-caladea.metainfo.xml
Normal file
17
google-crosextra-caladea.metainfo.xml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
|
||||||
|
<component type="font">
|
||||||
|
<id>google-crosextra-caladea</id>
|
||||||
|
<metadata_license>CC-BY-3.0</metadata_license>
|
||||||
|
<name>Caladea</name>
|
||||||
|
<summary>Serif font metric-compatible with Cambria font</summary>
|
||||||
|
<description>
|
||||||
|
<p>
|
||||||
|
Caladea is metric-compatible with Cambria font. This font is a serif
|
||||||
|
typeface family based on Lato.
|
||||||
|
</p>
|
||||||
|
</description>
|
||||||
|
<updatecontact>pnemade_at_redhat_dot_com</updatecontact>
|
||||||
|
<url type="homepage">http://code.google.com/p/chromium/issues/detail?id=168879</url>
|
||||||
|
</component>
|
||||||
|
|
@ -83,13 +83,13 @@ debug "Family: $OPT_FAMILY"
|
|||||||
debug "Lang: $OPT_LANG"
|
debug "Lang: $OPT_LANG"
|
||||||
debug "Artifacts dir: $OPT_ARTIFACTS_DIR"
|
debug "Artifacts dir: $OPT_ARTIFACTS_DIR"
|
||||||
debug "Package name: $OPT_PACKAGE"
|
debug "Package name: $OPT_PACKAGE"
|
||||||
STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}_${OPT_LANG}" | sed -e 's/\//-/g' -e 's/ /-/g')
|
STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}" | sed -e 's/\//-/g' -e 's/ /-/g')
|
||||||
debug "Log file: $STR_TEST_DASHED.log"
|
debug "Log file: $STR_TEST_DASHED.log"
|
||||||
|
|
||||||
clean_exit() {
|
clean_exit() {
|
||||||
rc=$?;
|
rc=$?;
|
||||||
trap - SIGINT SIGTERM SIGABRT EXIT
|
trap - SIGINT SIGTERM SIGABRT EXIT
|
||||||
echo "Run test $OPT_ALIAS: done. Test's exit code: $rc"
|
echo "Run test $OPT_ALIAS: done."
|
||||||
for pid in $(ps -o pid --no-headers --ppid $$); do
|
for pid in $(ps -o pid --no-headers --ppid $$); do
|
||||||
if [ -n "$(ps -p $pid -o pid=)" ]; then
|
if [ -n "$(ps -p $pid -o pid=)" ]; then
|
||||||
kill -s HUP $pid
|
kill -s HUP $pid
|
||||||
@ -114,16 +114,11 @@ clean_exit() {
|
|||||||
status="ERROR"
|
status="ERROR"
|
||||||
fi
|
fi
|
||||||
echo "$status $OPT_ALIAS" >> "$OPT_ARTIFACTS_DIR/test.log"
|
echo "$status $OPT_ALIAS" >> "$OPT_ARTIFACTS_DIR/test.log"
|
||||||
mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}"
|
mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}"
|
||||||
local results="$OPT_ARTIFACTS_DIR/results.yml"
|
local results="$OPT_ARTIFACTS_DIR/results.yml"
|
||||||
local result=$(echo $status | tr '[:upper:]' '[:lower:]')
|
local result=$(echo $status | tr '[:upper:]' '[:lower:]')
|
||||||
test -f "$results" || echo 'results:' > "$results"
|
test -f "$results" || echo 'results:' > "$results"
|
||||||
printf '%s\n' '' \
|
echo "- {result: $result, test: $OPT_ALIAS}" >> "$results"
|
||||||
"- test: $OPT_ALIAS" \
|
|
||||||
" result: $result" \
|
|
||||||
" logs:" \
|
|
||||||
" - ${status}_${log_file_name}" \
|
|
||||||
>> "$results"
|
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
trap clean_exit SIGINT SIGTERM SIGABRT EXIT
|
trap clean_exit SIGINT SIGTERM SIGABRT EXIT
|
||||||
@ -144,19 +139,15 @@ debug "Config: `cat $tmpconfd/fonts.conf`"
|
|||||||
|
|
||||||
mkdir -p "$OPT_ARTIFACTS_DIR"
|
mkdir -p "$OPT_ARTIFACTS_DIR"
|
||||||
export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log"
|
export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log"
|
||||||
logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
|
logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
|
||||||
logfile="$(realpath "$logfile")"
|
logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log"
|
||||||
exec > >(tee -a "$logfile") 2>&1
|
exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4)
|
||||||
|
|
||||||
debug "Check family assignment"
|
debug "Check family assignment"
|
||||||
res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-match -f "%{family[0]}" :family=$OPT_ALIAS:lang=$OPT_LANG`
|
res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-match -f "%{family[0]}" :family=$OPT_ALIAS:lang=$OPT_LANG`
|
||||||
ret=0
|
|
||||||
if [ "x$res" = "x$OPT_FAMILY" ]; then
|
if [ "x$res" = "x$OPT_FAMILY" ]; then
|
||||||
echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected"
|
echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected"
|
||||||
else
|
else
|
||||||
echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)"
|
echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)"
|
||||||
ret=1
|
|
||||||
fi
|
fi
|
||||||
rm -rf $tmpconfd
|
rm -rf $tmpconfd
|
||||||
|
|
||||||
exit $ret
|
|
||||||
|
@ -18,7 +18,6 @@ Options:
|
|||||||
-v, --verbose Turn on debug
|
-v, --verbose Turn on debug
|
||||||
-l, --lang=LANG Test LANG language coverage (default: en)
|
-l, --lang=LANG Test LANG language coverage (default: en)
|
||||||
-p, --path=PATH Test fonts on PATH
|
-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.
|
-n, --name=NAME Set NAME to store a log file.
|
||||||
-a, --artifactsdir=DIR test environment dir to store artifacts
|
-a, --artifactsdir=DIR test environment dir to store artifacts
|
||||||
-e, --exclude=FILE Exclude FILE to check.
|
-e, --exclude=FILE Exclude FILE to check.
|
||||||
@ -30,13 +29,12 @@ PROG="${PROG:-${0##*/}}"
|
|||||||
DEBUG="${DEBUG:-}"
|
DEBUG="${DEBUG:-}"
|
||||||
OPT_LANG="${OPT_LANG:-en}"
|
OPT_LANG="${OPT_LANG:-en}"
|
||||||
OPT_PATH=()
|
OPT_PATH=()
|
||||||
OPT_PACKAGE=()
|
|
||||||
OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}"
|
OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}"
|
||||||
OPT_EXCLUDE=()
|
OPT_EXCLUDE=()
|
||||||
OPT_INCLUDE=()
|
OPT_INCLUDE=()
|
||||||
OPT_NAME="${OPT_NAME:-}"
|
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:" -- "$@")
|
opt=$(getopt -n "$0" --options "hvl:p:n:a:e:i:" --longoptions "help,verbose,lang:,path:,name:,artifactsdir:,exclude:,include:" -- "$@")
|
||||||
eval set -- "$opt"
|
eval set -- "$opt"
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
@ -60,10 +58,6 @@ while [[ $# -gt 0 ]]; do
|
|||||||
OPT_PATH+=("$2")
|
OPT_PATH+=("$2")
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
-k|--package)
|
|
||||||
OPT_PACKAGE+=("$2")
|
|
||||||
shift 2
|
|
||||||
;;
|
|
||||||
-l|--lang)
|
-l|--lang)
|
||||||
OPT_LANG="$2"
|
OPT_LANG="$2"
|
||||||
shift 2
|
shift 2
|
||||||
@ -85,7 +79,7 @@ while [[ $# -gt 0 ]]; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ ! -v OPT_PATH ] && [ ! -v OPT_PACKAGE ]; then
|
if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then
|
||||||
echo "Use: $PROG -h for help."
|
echo "Use: $PROG -h for help."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@ -95,7 +89,7 @@ STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g')
|
|||||||
clean_exit() {
|
clean_exit() {
|
||||||
rc=$?;
|
rc=$?;
|
||||||
trap - SIGINT SIGTERM SIGABRT EXIT
|
trap - SIGINT SIGTERM SIGABRT EXIT
|
||||||
echo "Run test $OPT_LANG: done. Test's exit code: $rc"
|
echo "Run test $OPT_LANG: done."
|
||||||
for pid in $(ps -o pid --no-headers --ppid $$); do
|
for pid in $(ps -o pid --no-headers --ppid $$); do
|
||||||
if [ -n "$(ps -p $pid -o pid=)" ]; then
|
if [ -n "$(ps -p $pid -o pid=)" ]; then
|
||||||
kill -s HUP $pid
|
kill -s HUP $pid
|
||||||
@ -122,38 +116,20 @@ clean_exit() {
|
|||||||
status="ERROR"
|
status="ERROR"
|
||||||
fi
|
fi
|
||||||
echo "$status $OPT_LANG" >> "$OPT_ARTIFACTS_DIR/test.log"
|
echo "$status $OPT_LANG" >> "$OPT_ARTIFACTS_DIR/test.log"
|
||||||
mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}"
|
mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}"
|
||||||
local results="$OPT_ARTIFACTS_DIR/results.yml"
|
local results="$OPT_ARTIFACTS_DIR/results.yml"
|
||||||
local result=$(echo $status | tr '[:upper:]' '[:lower:]')
|
local result=$(echo $status | tr '[:upper:]' '[:lower:]')
|
||||||
test -f "$results" || echo 'results:' > "$results"
|
test -f "$results" || echo 'results:' > "$results"
|
||||||
printf '%s\n' '' \
|
echo "- {result: $result, test: $OPT_LANG}" >> "$results"
|
||||||
"- test: $OPT_LANG" \
|
|
||||||
" result: $result" \
|
|
||||||
" logs:" \
|
|
||||||
" - ${status}_${log_file_name}" \
|
|
||||||
>> "$results"
|
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
trap clean_exit SIGINT SIGTERM SIGABRT EXIT
|
trap clean_exit SIGINT SIGTERM SIGABRT EXIT
|
||||||
|
|
||||||
mkdir -p "$OPT_ARTIFACTS_DIR"
|
mkdir -p "$OPT_ARTIFACTS_DIR"
|
||||||
export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log"
|
export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log"
|
||||||
logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
|
logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
|
||||||
logfile="$(realpath "$logfile")"
|
logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log"
|
||||||
exec > >(tee -a "$logfile") 2>&1
|
exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4)
|
||||||
|
|
||||||
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() {
|
expand_regex() {
|
||||||
local p ret=()
|
local p ret=()
|
||||||
@ -210,7 +186,6 @@ contains() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
debug "Check language coverage"
|
debug "Check language coverage"
|
||||||
ret=0
|
|
||||||
set +f
|
set +f
|
||||||
for p in ${OPT_PATH[@]}; do
|
for p in ${OPT_PATH[@]}; do
|
||||||
for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do
|
for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do
|
||||||
@ -220,33 +195,30 @@ for p in ${OPT_PATH[@]}; do
|
|||||||
n=`basename $i`
|
n=`basename $i`
|
||||||
set +e
|
set +e
|
||||||
contains "$n" "${OPT_EXCLUDE[@]}"
|
contains "$n" "${OPT_EXCLUDE[@]}"
|
||||||
r=$?
|
ret=$?
|
||||||
set -e
|
set -e
|
||||||
if [ $r -eq 1 ]; then
|
if [ $ret -eq 1 ]; then
|
||||||
debug "ignoring $i"
|
debug "ignoring $i"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then
|
if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then
|
||||||
set +e
|
set +e
|
||||||
contains "$n" "${OPT_INCLUDE[@]}"
|
contains "$n" "${OPT_INCLUDE[@]}"
|
||||||
r=$?
|
ret=$?
|
||||||
set -e
|
set -e
|
||||||
if [ $r -eq 0 ]; then
|
if [ $ret -eq 0 ]; then
|
||||||
debug "$i isn't targeted file"
|
debug "$i isn't targeted file"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
NOT_MATCHED=("${NOT_MATCHED[@]/$n}")
|
NOT_MATCHED=("${NOT_MATCHED[@]/$n}")
|
||||||
fi
|
fi
|
||||||
debug " $i"
|
debug " $i"
|
||||||
res=`fc-validate -l $OPT_LANG $i || :`
|
res=`fc-validate -l $OPT_LANG $i`
|
||||||
if echo $res | grep -q Missing; then
|
if echo $res | grep -q Missing; then
|
||||||
echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage."
|
echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage."
|
||||||
ret=1
|
|
||||||
else
|
else
|
||||||
echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage."
|
echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
exit $ret
|
|
||||||
|
@ -2,14 +2,10 @@
|
|||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: language coverage
|
- name: language coverage
|
||||||
environment:
|
script: run-lang-coverage-test --lang "{{ item }}" {% if coverage.values is not defined or coverage[item].path_prefix is not defined %} --path {{ path_prefix }} {% 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 }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}}
|
||||||
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:
|
with_items:
|
||||||
- "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}"
|
- "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}"
|
||||||
- name: generic family assignment
|
- name: generic family assignment
|
||||||
environment:
|
|
||||||
LANG: "en_US.UTF-8"
|
|
||||||
when: families is defined
|
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 }}
|
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 }}
|
||||||
with_items:
|
with_items:
|
||||||
@ -42,7 +38,3 @@
|
|||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: str-common-final
|
name: str-common-final
|
||||||
|
|
||||||
- name: Validate the result
|
|
||||||
shell: echo "test_results.stdout"
|
|
||||||
failed_when: test_results.stdout != 'PASS'
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
- role: custom-test-fonts
|
- role: custom-test-fonts
|
||||||
required_packages:
|
required_packages:
|
||||||
- google-crosextra-caladea-fonts
|
- google-crosextra-caladea-fonts
|
||||||
path_prefix: /usr/share/fonts/google-crosextra-caladea-fonts
|
path_prefix: /usr/share/fonts/google-crosextra-caladea
|
||||||
package: google-crosextra-caladea-fonts
|
package: google-crosextra-caladea-fonts
|
||||||
coverage:
|
coverage:
|
||||||
- en
|
- en
|
||||||
|
Loading…
Reference in New Issue
Block a user