diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-30 10:33:53 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-05-01 00:35:24 +0200 |
| commit | 3c32b4be2cc7ab6a04a0fd6240258e76ce1a825e (patch) | |
| tree | e4ae3616284c3fd1ca2c633aabe234d37b6de828 | |
| parent | 9d211a8652526a08cda05b50f6b4b0e764ba64ad (diff) | |
| download | urpmi-3c32b4be2cc7ab6a04a0fd6240258e76ce1a825e.tar urpmi-3c32b4be2cc7ab6a04a0fd6240258e76ce1a825e.tar.gz urpmi-3c32b4be2cc7ab6a04a0fd6240258e76ce1a825e.tar.bz2 urpmi-3c32b4be2cc7ab6a04a0fd6240258e76ce1a825e.tar.xz urpmi-3c32b4be2cc7ab6a04a0fd6240258e76ce1a825e.zip | |
BSD: prevent failing due to broken deps generator
some FreeBSD CPAN smokers sometimes fails with:
error: Couldn't exec /usr/local/lib/rpm/elfdeps: No such file or directory
The testsuite passes smoothly before & after that change.
The only impact is that with that,
t/media/rpm-query-in-scriptlet/rpm-query-in-scriptlet-1-1.x86_64.rpm
lose one requires on one of its own provides:
removed REQUIRES librpm.so.9()(64bit)
Which is fine.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | t/02create_pkgs.t | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -1,4 +1,5 @@ - cpan_testers: + o BSD: prevent failing due to broken deps generator o do not skip network tests on pre-UsrMove distros (eg: Mageia 2) o fix running testsuite with rpm-4.9 o fix testuite if glibc-static-devel isn't installed on Mageia 2 diff --git a/t/02create_pkgs.t b/t/02create_pkgs.t index d052f5b3..cbb562c5 100644 --- a/t/02create_pkgs.t +++ b/t/02create_pkgs.t @@ -92,6 +92,9 @@ sub rpmbuild { # unsetting %__os_install_post fixes failure to build on FreeBSD: $extra_args .= " --define '__os_install_post %nil'"; $extra_args .= " --define 'rpm_version %(rpm -q --queryformat \"%{VERSION}\" rpm|sed -e \"s/\\\\.//g\")' "; + # some FreeBSD CPAN smokers sometimes fails with: + # error: Couldn't exec /usr/local/lib/rpm/elfdeps: No such file or directory + $extra_args .= " --define '__elf_provides %nil' --define '__elf_requires %nil'" if $is_bsd; system_("rpmbuild --quiet --define '_topdir $dir/tmp' --define '_tmppath $dir/tmp' -bb --clean --nodeps $extra_args $spec"); my ($name) = $spec =~ m!([^/]*)\.spec$!; |