diff options
Diffstat (limited to '')
| -rw-r--r-- | tests/apt-patterns | 2 | ||||
| -rw-r--r-- | tests/apt-patterns-custom | 2 | ||||
| -rw-r--r-- | tests/aspcud-apt-solver | 2 | ||||
| -rw-r--r-- | tests/essential-hook | 1 | ||||
| -rw-r--r-- | tests/include | 1 | ||||
| -rw-r--r-- | tests/include-foreign-libmagic-mgc | 1 | ||||
| -rw-r--r-- | tests/include-foreign-libmagic-mgc-with-multiple-arch-options | 1 | ||||
| -rw-r--r-- | tests/logfile | 1 | ||||
| -rw-r--r-- | tests/multiple-include | 1 | ||||
| -rw-r--r-- | tests/not-having-to-install-apt-in-include-because-a-hook-did-it-before | 2 | ||||
| -rw-r--r-- | tests/skip-tar-in-mknod | 5 |
11 files changed, 7 insertions, 12 deletions
diff --git a/tests/apt-patterns b/tests/apt-patterns index c87e932..a4f03e2 100644 --- a/tests/apt-patterns +++ b/tests/apt-patterns @@ -5,4 +5,4 @@ trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM {{ CMD }} --mode={{ MODE }} --variant=essential \ --include '?or(?exact-name(dummy-does-not-exist),?exact-name(apt))' \ {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }} -tar -tf /tmp/debian-chroot.tar | sort | grep -v ./var/lib/apt/extended_states | diff -u tar1.txt - +tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt - diff --git a/tests/apt-patterns-custom b/tests/apt-patterns-custom index 2348a76..bd78ed1 100644 --- a/tests/apt-patterns-custom +++ b/tests/apt-patterns-custom @@ -6,4 +6,4 @@ trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM --include '?narrow(?archive(^{{ DIST }}$),?essential)' \ --include apt \ {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }} -tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt - +{ tar -tf /tmp/debian-chroot.tar; echo ./var/lib/apt/extended_states; } | sort | diff -u tar1.txt - diff --git a/tests/aspcud-apt-solver b/tests/aspcud-apt-solver index bc0fbc3..24ab3f8 100644 --- a/tests/aspcud-apt-solver +++ b/tests/aspcud-apt-solver @@ -6,6 +6,6 @@ trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM --include "$(tr '\n' ',' < pkglist.txt)" \ --aptopt='APT::Solver "aspcud"' \ {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }} -tar -tf /tmp/debian-chroot.tar | sort \ +{ tar -tf /tmp/debian-chroot.tar; echo ./var/lib/apt/extended_states; } | sort \ | grep -v '^./etc/apt/apt.conf.d/99mmdebstrap$' \ | diff -u tar1.txt - diff --git a/tests/essential-hook b/tests/essential-hook index dc2b01f..0013a1a 100644 --- a/tests/essential-hook +++ b/tests/essential-hook @@ -17,5 +17,4 @@ tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort \ | grep -v '^./usr/share/lintian/overrides/tzdata' \ | grep -v '^./usr/share/zoneinfo' \ | grep -v '^./var/lib/dpkg/info/tzdata.' \ - | grep -v '^./var/lib/apt/extended_states$' \ | diff -u tar1.txt - diff --git a/tests/include b/tests/include index e284b7d..42d6936 100644 --- a/tests/include +++ b/tests/include @@ -6,7 +6,6 @@ trap "rm -rf /tmp/debian-chroot" EXIT INT TERM rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-* rm -r /tmp/debian-chroot/usr/share/doc/debian rm -r /tmp/debian-chroot/usr/share/doc/doc-debian -rm /tmp/debian-chroot/var/lib/apt/extended_states rm /tmp/debian-chroot/var/lib/dpkg/info/doc-debian.list rm /tmp/debian-chroot/var/lib/dpkg/info/doc-debian.md5sums tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt - diff --git a/tests/include-foreign-libmagic-mgc b/tests/include-foreign-libmagic-mgc index 7845b31..6b0bd7d 100644 --- a/tests/include-foreign-libmagic-mgc +++ b/tests/include-foreign-libmagic-mgc @@ -36,7 +36,6 @@ rm /tmp/debian-chroot/usr/share/doc/libmagic-mgc/changelog.gz rm /tmp/debian-chroot/usr/share/doc/libmagic-mgc/copyright rm /tmp/debian-chroot/usr/share/file/magic.mgc rm /tmp/debian-chroot/usr/share/misc/magic.mgc -rm /tmp/debian-chroot/var/lib/apt/extended_states rm /tmp/debian-chroot/var/lib/dpkg/info/libmagic-mgc.list rm /tmp/debian-chroot/var/lib/dpkg/info/libmagic-mgc.md5sums rmdir /tmp/debian-chroot/usr/share/doc/libmagic-mgc/ diff --git a/tests/include-foreign-libmagic-mgc-with-multiple-arch-options b/tests/include-foreign-libmagic-mgc-with-multiple-arch-options index 8155727..6d878e0 100644 --- a/tests/include-foreign-libmagic-mgc-with-multiple-arch-options +++ b/tests/include-foreign-libmagic-mgc-with-multiple-arch-options @@ -37,7 +37,6 @@ rm /tmp/debian-chroot/usr/share/doc/libmagic-mgc/changelog.gz rm /tmp/debian-chroot/usr/share/doc/libmagic-mgc/copyright rm /tmp/debian-chroot/usr/share/file/magic.mgc rm /tmp/debian-chroot/usr/share/misc/magic.mgc -rm /tmp/debian-chroot/var/lib/apt/extended_states rm /tmp/debian-chroot/var/lib/dpkg/info/libmagic-mgc.list rm /tmp/debian-chroot/var/lib/dpkg/info/libmagic-mgc.md5sums rmdir /tmp/debian-chroot/usr/share/doc/libmagic-mgc/ diff --git a/tests/logfile b/tests/logfile index 5e2dbeb..eff6504 100644 --- a/tests/logfile +++ b/tests/logfile @@ -16,6 +16,7 @@ I: running apt-get update... I: downloading packages with apt... I: extracting archives... I: installing essential packages... +I: installing remaining packages inside the chroot... I: cleaning package lists and apt cache... LOG tail --lines=1 /tmp/log | grep '^I: success in .* seconds$' diff --git a/tests/multiple-include b/tests/multiple-include index 36f53ec..eaef935 100644 --- a/tests/multiple-include +++ b/tests/multiple-include @@ -11,7 +11,6 @@ rm /tmp/debian-chroot/etc/localtime rm /tmp/debian-chroot/etc/timezone rm -r /tmp/debian-chroot/usr/share/doc/tzdata rm -r /tmp/debian-chroot/usr/share/zoneinfo -rm /tmp/debian-chroot/var/lib/apt/extended_states for p in doc-debian tzdata; do for f in list md5sums config postinst postrm templates preinst prerm; do [ -e "/tmp/debian-chroot/var/lib/dpkg/info/$p.$f" ] || continue diff --git a/tests/not-having-to-install-apt-in-include-because-a-hook-did-it-before b/tests/not-having-to-install-apt-in-include-because-a-hook-did-it-before index 9a36307..c745cf3 100644 --- a/tests/not-having-to-install-apt-in-include-because-a-hook-did-it-before +++ b/tests/not-having-to-install-apt-in-include-because-a-hook-did-it-before @@ -6,4 +6,4 @@ trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM --essential-hook='APT_CONFIG=$MMDEBSTRAP_APT_CONFIG apt-get update' \ --essential-hook='APT_CONFIG=$MMDEBSTRAP_APT_CONFIG apt-get --yes install apt' \ {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }} -tar -tf /tmp/debian-chroot.tar | sort | grep -v ./var/lib/apt/extended_states | diff -u tar1.txt - +tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt - diff --git a/tests/skip-tar-in-mknod b/tests/skip-tar-in-mknod index cc18977..eb3027a 100644 --- a/tests/skip-tar-in-mknod +++ b/tests/skip-tar-in-mknod @@ -3,7 +3,7 @@ set -eu export LC_ALL=C.UTF-8 export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }} -#[ {{ MODE }} = "unshare" ] +[ {{ MODE }} = "unshare" ] trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM @@ -22,8 +22,7 @@ fi $prefix {{ CMD }} --mode={{ MODE }} --variant=custom \ --skip=update,setup,cleanup,tar-in/mknod \ --setup-hook='tar-in ./cache/mmdebstrap-{{ DIST }}-apt.tar /' \ - --setup-hook='/sbin/auditctl -w "$1" -p wxa -k mykey' \ - '' /tmp/debian-chroot.tar || /sbin/ausearch --format text -k mykey + '' /tmp/debian-chroot.tar cmp ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar \ || diffoscope ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar |