diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-21 20:49:14 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-28 21:05:35 +0200 |
| commit | c8d94c659ad50c1f0f3a3cc61482c07735047370 (patch) | |
| tree | 1d1ec36439a6c156551bd88307fda5f774269629 | |
| parent | 76024b2425216fea94bca3b09976eb85d26ebf54 (diff) | |
| download | urpmi-c8d94c659ad50c1f0f3a3cc61482c07735047370.tar urpmi-c8d94c659ad50c1f0f3a3cc61482c07735047370.tar.gz urpmi-c8d94c659ad50c1f0f3a3cc61482c07735047370.tar.bz2 urpmi-c8d94c659ad50c1f0f3a3cc61482c07735047370.tar.xz urpmi-c8d94c659ad50c1f0f3a3cc61482c07735047370.zip | |
cpan-testers: fix failing test on Debian 9/FreeBSD
commit 1089a6c113c53cd77147808ebeb4f6d0ef03fa89 really was about
silencing a warning, so let's not break other OSes who do not have that
lib or not in this location
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | t/data/SPECS/rpm-query-in-scriptlet.spec | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -2,6 +2,7 @@ o check & report where genhdlist2 is o check that web server has actually started o describe more tests to help pinpoint regressions + o do not fail test when libnss.so is not found in Debian 9 or FreeBSD o fix test with rpm < 4.13 on CentOS7 o perform some file conflict tests only on Mageia o try harder to find genhdlist2 in uninstalled CPAN modules diff --git a/t/data/SPECS/rpm-query-in-scriptlet.spec b/t/data/SPECS/rpm-query-in-scriptlet.spec index d7c08f1a..630d036d 100644 --- a/t/data/SPECS/rpm-query-in-scriptlet.spec +++ b/t/data/SPECS/rpm-query-in-scriptlet.spec @@ -13,9 +13,9 @@ x %install rm -rf %buildroot # Fix a testsuite warning ("warning: %post(rpm-query-in-scriptlet-1-1.x86_64) scriptlet failed" b/c of: "error: Failed to initialize NSS library") -%ifos linux +if [ -e %{_libdir}/libnss3.so ]; then echo %{_libdir}/libnss3.so > list -%endif +fi # Find out needed deps: for i in sh rpm; do |