patch cantera for test tolerances on alternate architectures

This commit is contained in:
Mark E. Fuller 2022-05-26 21:26:30 +03:00
parent 268fc9957a
commit daa078f8c8
No known key found for this signature in database
GPG Key ID: D1CB9BCF4D87185F
3 changed files with 9 additions and 13 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/v2.6.0b2.tar.gz
/cantera-2.6.0b2.tar.gz
/v2.6.0.tar.gz
/cantera-test-ppc64le-aarch64-s390x.patch

View File

@ -2,12 +2,16 @@
Name: cantera
Version: 2.6.0
Release: %autorelease
Release: %{?autorelease}%{!?autorelease:22{?dist}}
Summary: Chemical kinetics, thermodynamics, and transport tool suite
License: BSD
URL: https://github.com/%{fork}/%{name}/
Source0: %{url}archive/refs/tags/v%{version}.tar.gz
# thermoToYaml test failures on ppc64le and aarch64 and s390x - BZ #2081451
# increase test tolerance to pass
Patch0: cantera-test-ppc64le-aarch64-s390x.patch
BuildRequires: boost-devel
BuildRequires: eigen3-devel
BuildRequires: fmt-devel
@ -37,11 +41,6 @@ BuildRequires: gcc-gfortran
%global scons scons%{?rhel:-3}
ExcludeArch: s390x # YAML test failures - BZ #2044056
ExcludeArch: aarch64 # thermoToYaml test failures - BZ #2081451
ExcludeArch: ppc64le # thermoToYaml test failures - BZ #2081451
%global common_description %{expand: \
Cantera is a suite of object-oriented software tools for solving problems
involving chemical kinetics, thermodynamics, and/or transport processes.
@ -93,8 +92,8 @@ Summary: Static libraries for Cantera
%prep
%autosetup -n %{name}-%{version}
%setup -n %{name}-%{version}
%patch0 -p0
%build
%set_build_flags
@ -141,17 +140,13 @@ rm -rf %{buildroot}%{_prefix}/local/
%license %{_datadir}/%{name}/doc/LICENSE.txt
%doc AUTHORS README.rst
%doc %{_mandir}/man1/ck2cti.1.gz
%doc %{_mandir}/man1/ck2yaml.1.gz
%doc %{_mandir}/man1/cti2yaml.1.gz
%doc %{_mandir}/man1/ctml2yaml.1.gz
%doc %{_mandir}/man1/ctml_writer.1.gz
%{_bindir}/ck2cti
%{_bindir}/ck2yaml
%{_bindir}/cti2yaml
%{_bindir}/ctml2yaml
%{_bindir}/ctml_writer
%{_datadir}/%{name}
@ -161,7 +156,6 @@ rm -rf %{buildroot}%{_prefix}/local/
%files -n python3-%{name}
%{python3_sitearch}/Cantera-%{version}.dist-info/
%{python3_sitearch}/%{name}/
%files devel

View File

@ -1 +1,2 @@
SHA512 (cantera-test-ppc64le-aarch64-s390x.patch) = 5eea9242cb94d95fda24e11ba90303c9f74171046412deb706f3679235bb55332d43e91b1282ca9ce9c572e8c32aba7e5b1794007ca49454e024d30f2d36c5b1
SHA512 (v2.6.0.tar.gz) = 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856