[gentoo-commits] proj/portage:master commit in: .github/workflows/, lib/portage/tests/emerge/

[gentoo-commits] proj/portage:master commit in: .github/workflows/, lib/portage/tests/emerge/

[Sam James]

commit:     eee0ea0cef115e274d97a7c9707aaa8fc40b5688
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 01:07:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 22:01:49 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=eee0ea0c

CI: add pax-utils for test_binpkg_libc_dep_inject test

I've made the test_binpkg_libc_dep_inject test gracefully skip if scanelf
from pax-utils isn't around, but we want to test this thing in CI, so add
the pax-utils package.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .github/workflows/ci.yml                         | 2 +-
 lib/portage/tests/emerge/test_libc_dep_inject.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eedbe2f6e4..698b8dcacf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
           set -xe
           echo "force-unsafe-io" | sudo tee /etc/dpkg/dpkg.cfg.d/force-unsafe-io
           sudo apt-get update -q
-          sudo apt-get install -qy --no-install-recommends libxslt-dev libxml2-dev libxml2-utils meson zstd
+          sudo apt-get install -qy --no-install-recommends libxslt-dev libxml2-dev libxml2-utils meson pax-utils zstd
 
           # Patch Ubuntu's old Meson to fix pypy-3.9 detection.
           curl -s -f https://github.com/mesonbuild/meson/commit/2540ad6e9e08370ddd0b6753fdc9314945a672f0.patch | sudo patch -d /usr/lib/python3/dist-packages -p1 --no-backup-if-mismatch

diff --git a/lib/portage/tests/emerge/test_libc_dep_inject.py b/lib/portage/tests/emerge/test_libc_dep_inject.py
index 10a4ae4120..31a66e8614 100644
--- a/lib/portage/tests/emerge/test_libc_dep_inject.py
+++ b/lib/portage/tests/emerge/test_libc_dep_inject.py
@@ -35,7 +35,8 @@ class LibcDepInjectEmergeTestCase(TestCase):
 
         src_install() {
             insinto /usr/bin
-            # We need an ELF binary for the injection to trigger
+            # We need an ELF binary for the injection to trigger, so
+            # use ${BASH} given we know it must be around for running ebuilds.
             cp "${BASH}" "${ED}"/usr/bin/${PN} || die
         }
         """