Work around mock locale issues in test suite
Explicitly run the test suite in the en_US.UTF-8 locale to work around flaky locale settings in mock builders.
This commit is contained in:
parent
4fcb4f9ea8
commit
ab0e53ac52
12
libssh2.spec
12
libssh2.spec
|
@ -1,6 +1,6 @@
|
||||||
Name: libssh2
|
Name: libssh2
|
||||||
Version: 1.8.0
|
Version: 1.8.0
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
Summary: A library implementing the SSH2 protocol
|
Summary: A library implementing the SSH2 protocol
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.libssh2.org/
|
URL: http://www.libssh2.org/
|
||||||
|
@ -18,6 +18,10 @@ BuildRequires: /usr/bin/man
|
||||||
|
|
||||||
# Test suite requirements - we run the OpenSSH server and try to connect to it
|
# Test suite requirements - we run the OpenSSH server and try to connect to it
|
||||||
BuildRequires: openssh-server
|
BuildRequires: openssh-server
|
||||||
|
# Need a valid locale to run the mansyntax check
|
||||||
|
%if 0%{?fedora} > 23 || 0%{?rhel} > 7
|
||||||
|
BuildRequires: glibc-langpack-en
|
||||||
|
%endif
|
||||||
# We use matchpathcon to get the correct SELinux context for the ssh server
|
# We use matchpathcon to get the correct SELinux context for the ssh server
|
||||||
# initialization script so that it can transition correctly in an SELinux
|
# initialization script so that it can transition correctly in an SELinux
|
||||||
# environment
|
# environment
|
||||||
|
@ -103,7 +107,7 @@ echo "exit 0" > tests/ssh2.sh
|
||||||
echo "Skipping mansyntax test on PPC* and aarch64"
|
echo "Skipping mansyntax test on PPC* and aarch64"
|
||||||
echo "exit 0" > tests/mansyntax.sh
|
echo "exit 0" > tests/mansyntax.sh
|
||||||
%endif
|
%endif
|
||||||
make -C tests check
|
LC_ALL=en_US.UTF-8 make -C tests check
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
|
@ -127,6 +131,10 @@ make -C tests check
|
||||||
%{_libdir}/pkgconfig/libssh2.pc
|
%{_libdir}/pkgconfig/libssh2.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 4 2019 Paul Howarth <paul@city-fan.org> - 1.8.0-10
|
||||||
|
- Explicitly run the test suite in the en_US.UTF-8 locale to work around flaky
|
||||||
|
locale settings in mock builders
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue