This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=d12eddb2b240b8a079b5a9cc1c166375f19f6a0d commit d12eddb2b240b8a079b5a9cc1c166375f19f6a0d Author: Guillem Jover <[email protected]> AuthorDate: Wed Apr 12 23:53:42 2023 +0200 test: Split deb-format tests per compressor This means that we can still test specific formats even when the system lacks less common compressors, instead of skipping everything. --- src/at/deb-format.at | 230 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 141 insertions(+), 89 deletions(-) diff --git a/src/at/deb-format.at b/src/at/deb-format.at index 53b27093b..b5d0fe8fa 100644 --- a/src/at/deb-format.at +++ b/src/at/deb-format.at @@ -183,24 +183,14 @@ m4_define([DPKG_GEN_PKG_DEB_FORMAT_TEMPL], [ ar x pkg-templ.deb gzip -c control.tar >control.tar.gz gzip -c data.tar >data.tar.gz - xz -c control.tar >control.tar.xz - xz -c data.tar >data.tar.xz - zstd -c control.tar >control.tar.zst - zstd -c data.tar >data.tar.zst - bzip2 -c data.tar >data.tar.bz2 - lzma -c data.tar >data.tar.lzma ]) ]) -AT_SETUP([dpkg-deb .deb format 2.x]) +AT_SETUP([dpkg-deb .deb format 2.x (core)]) AT_KEYWORDS([dpkg-deb deb]) -AT_SKIP_IF([! command -v xz >/dev/null]) AT_SKIP_IF([! command -v gzip >/dev/null]) -AT_SKIP_IF([! command -v zstd >/dev/null]) -AT_SKIP_IF([! command -v bzip2 >/dev/null]) -AT_SKIP_IF([! command -v lzma >/dev/null]) AT_DATA([pkg-deb-bogus-empty.deb], []) AT_CHECK([ @@ -433,32 +423,6 @@ data.tar Description: test package - deb format support ]) -AT_CHECK([ -# Test control.tar.xz member -ar rc pkg-control-xz.deb debian-binary control.tar.xz data.tar.xz -ar t pkg-control-xz.deb -dpkg-deb -c pkg-control-xz.deb -], [], [debian-binary -control.tar.xz -data.tar.xz -drwxr-xr-x root/root 0 1970-01-01 00:00 ./ --rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old --rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ -]) - -AT_CHECK([ -# Test control.tar.zst member -ar rc pkg-control-zst.deb debian-binary control.tar.zst data.tar.zst -ar t pkg-control-zst.deb -dpkg-deb -c pkg-control-zst.deb -], [], [debian-binary -control.tar.zst -data.tar.zst -drwxr-xr-x root/root 0 1970-01-01 00:00 ./ --rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old --rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ -]) - AT_CHECK([ # Test data.tar member ar rc pkg-data-none.deb debian-binary control.tar.gz data.tar @@ -485,58 +449,6 @@ drwxr-xr-x root/root 0 1970-01-01 00:00 ./ -rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ ]) -AT_CHECK([ -# Test data.tar.xz member -ar rc pkg-data-xz.deb debian-binary control.tar.gz data.tar.xz -ar t pkg-data-xz.deb -dpkg-deb -c pkg-data-xz.deb -], [], [debian-binary -control.tar.gz -data.tar.xz -drwxr-xr-x root/root 0 1970-01-01 00:00 ./ --rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old --rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ -]) - -AT_CHECK([ -# Test data.tar.zst member -ar rc pkg-data-zst.deb debian-binary control.tar.gz data.tar.zst -ar t pkg-data-zst.deb -dpkg-deb -c pkg-data-zst.deb -], [], [debian-binary -control.tar.gz -data.tar.zst -drwxr-xr-x root/root 0 1970-01-01 00:00 ./ --rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old --rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ -]) - -AT_CHECK([ -# Test data.tar.bz2 member -ar rc pkg-data-bz2.deb debian-binary control.tar.gz data.tar.bz2 -ar t pkg-data-bz2.deb -dpkg-deb -c pkg-data-bz2.deb -], [], [debian-binary -control.tar.gz -data.tar.bz2 -drwxr-xr-x root/root 0 1970-01-01 00:00 ./ --rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old --rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ -]) - -AT_CHECK([ -# Test data.tar.lzma member -ar rc pkg-data-lzma.deb debian-binary control.tar.gz data.tar.lzma -ar t pkg-data-lzma.deb -dpkg-deb -c pkg-data-lzma.deb -], [], [debian-binary -control.tar.gz -data.tar.lzma -drwxr-xr-x root/root 0 1970-01-01 00:00 ./ --rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old --rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ -]) - AT_CHECK([ # Test non-uniform data.tar/control.tar member compression ar rc pkg-mixed-comp.deb debian-binary control.tar data.tar.gz @@ -579,6 +491,48 @@ cmp ctrl-gzip.tar control.tar cmp fsys-gzip.tar data.tar ]) +AT_CLEANUP + + +AT_SETUP([dpkg-deb .deb format 2.x (xz)]) +AT_KEYWORDS([dpkg-deb deb]) + +AT_SKIP_IF([! command -v gzip >/dev/null]) +AT_SKIP_IF([! command -v xz >/dev/null]) + +DPKG_GEN_PKG_DEB_FORMAT_TEMPL() +AT_CHECK([ +# Extract the base members +xz -c control.tar >control.tar.xz +xz -c data.tar >data.tar.xz +]) + +AT_CHECK([ +# Test control.tar.xz member +ar rc pkg-control-xz.deb debian-binary control.tar.xz data.tar.xz +ar t pkg-control-xz.deb +dpkg-deb -c pkg-control-xz.deb +], [], [debian-binary +control.tar.xz +data.tar.xz +drwxr-xr-x root/root 0 1970-01-01 00:00 ./ +-rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old +-rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ +]) + +AT_CHECK([ +# Test data.tar.xz member +ar rc pkg-data-xz.deb debian-binary control.tar.gz data.tar.xz +ar t pkg-data-xz.deb +dpkg-deb -c pkg-data-xz.deb +], [], [debian-binary +control.tar.gz +data.tar.xz +drwxr-xr-x root/root 0 1970-01-01 00:00 ./ +-rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old +-rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ +]) + AT_CHECK([ # Test building and extracting xz compressed archive dpkg-deb --uniform-compression --root-owner-group -Zxz -b pkg-templ pkg-comp-xz.deb >/dev/null @@ -588,6 +542,48 @@ cmp ctrl-xz.tar control.tar cmp fsys-xz.tar data.tar ]) +AT_CLEANUP + + +AT_SETUP([dpkg-deb .deb format 2.x (zstd)]) +AT_KEYWORDS([dpkg-deb deb]) + +AT_SKIP_IF([! command -v gzip >/dev/null]) +AT_SKIP_IF([! command -v zstd >/dev/null]) + +DPKG_GEN_PKG_DEB_FORMAT_TEMPL() +AT_CHECK([ +# Extract the base members +zstd -c control.tar >control.tar.zst +zstd -c data.tar >data.tar.zst +]) + +AT_CHECK([ +# Test control.tar.zst member +ar rc pkg-control-zst.deb debian-binary control.tar.zst data.tar.zst +ar t pkg-control-zst.deb +dpkg-deb -c pkg-control-zst.deb +], [], [debian-binary +control.tar.zst +data.tar.zst +drwxr-xr-x root/root 0 1970-01-01 00:00 ./ +-rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old +-rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ +]) + +AT_CHECK([ +# Test data.tar.zst member +ar rc pkg-data-zst.deb debian-binary control.tar.gz data.tar.zst +ar t pkg-data-zst.deb +dpkg-deb -c pkg-data-zst.deb +], [], [debian-binary +control.tar.gz +data.tar.zst +drwxr-xr-x root/root 0 1970-01-01 00:00 ./ +-rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old +-rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ +]) + AT_CHECK([ # Test building and extracting zstd compressed archive dpkg-deb --uniform-compression --root-owner-group -Zzstd -b pkg-templ pkg-comp-zstd.deb >/dev/null @@ -598,3 +594,59 @@ cmp fsys-zstd.tar data.tar ]) AT_CLEANUP + + +AT_SETUP([dpkg-deb .deb format 2.x (bzip2)]) +AT_KEYWORDS([dpkg-deb deb]) + +AT_SKIP_IF([! command -v gzip >/dev/null]) +AT_SKIP_IF([! command -v bzip2 >/dev/null]) + +DPKG_GEN_PKG_DEB_FORMAT_TEMPL() +AT_CHECK([ +# Extract the base members +bzip2 -c data.tar >data.tar.bz2 +]) + +AT_CHECK([ +# Test data.tar.bz2 member +ar rc pkg-data-bz2.deb debian-binary control.tar.gz data.tar.bz2 +ar t pkg-data-bz2.deb +dpkg-deb -c pkg-data-bz2.deb +], [], [debian-binary +control.tar.gz +data.tar.bz2 +drwxr-xr-x root/root 0 1970-01-01 00:00 ./ +-rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old +-rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ +]) + +AT_CLEANUP + + +AT_SETUP([dpkg-deb .deb format 2.x (lzma)]) +AT_KEYWORDS([dpkg-deb deb]) + +AT_SKIP_IF([! command -v gzip >/dev/null]) +AT_SKIP_IF([! command -v lzma >/dev/null]) + +DPKG_GEN_PKG_DEB_FORMAT_TEMPL() +AT_CHECK([ +# Extract the base members +lzma -c data.tar >data.tar.lzma +]) + +AT_CHECK([ +# Test data.tar.lzma member +ar rc pkg-data-lzma.deb debian-binary control.tar.gz data.tar.lzma +ar t pkg-data-lzma.deb +dpkg-deb -c pkg-data-lzma.deb +], [], [debian-binary +control.tar.gz +data.tar.lzma +drwxr-xr-x root/root 0 1970-01-01 00:00 ./ +-rw-r--r-- root/root 641345 1970-01-01 00:00 ./ChangeLog.old +-rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ +]) + +AT_CLEANUP -- Dpkg.Org's dpkg
