diff options
| author |   Sam James <sam@gentoo.org> | 2023-12-10 01:07:31 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-12-10 22:01:49 +0000 |
| commit | eee0ea0cef115e274d97a7c9707aaa8fc40b5688 (patch) | |
| tree | 12e4f763a982564be39797651a871e8f8d268d73 | |
| parent | ebuild: inject implicit libc RDEPEND (diff) | |
| download | portage-eee0ea0cef115e274d97a7c9707aaa8fc40b5688.tar.gz portage-eee0ea0cef115e274d97a7c9707aaa8fc40b5688.tar.bz2 portage-eee0ea0cef115e274d97a7c9707aaa8fc40b5688.zip | |
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@gentoo.org>
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | 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 eedbe2f6e..698b8dcac 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 10a4ae412..31a66e861 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 } """ |