List for cgit developers and users
 help / color / mirror / Atom feed
* [RFC/PATCH] t0107: support older tar in zstd untar test
@ 2020-08-08 19:41 Todd Zullinger
  2020-08-10  2:26 ` Todd Zullinger
  0 siblings, 1 reply; 4+ messages in thread
From: Todd Zullinger @ 2020-08-08 19:41 UTC (permalink / raw)
  To: cgit; +Cc: Christian Hesse, Hanspeter Portner

The tar --zstd option was added in GNU tar-1.32 (2019-02-23)¹.  Avoid the
requirement on a (relatively) recent version of tar by piping the output
of `zstd -dcf` to tar.  As a real-world example, I ran into this test
failure while building for CentOS/RHEL 8, which ships with tar-1.30.

It may also be a slight benefit that this more closely matches what the
snapshot creation code does, so arguably we could adjust the other tests
to match.

Alternately, we could add PREREQ's for the version of tar which adds the
corresponding compression algorithm shortcut², but that seems like a bit
of work for very little gain.  And it differs (if only ever so slightly)
from the pipe method we use to create the tar archives being tested.

¹ Technically, it was first released in tar-1.31 (2019-01-02), but this
  release was very short-lived and is no longer listed on the GNU Tar
  release page.

² The compression shortcuts for the 3 algorithms we have behind PREREQ's
  are --xz, --lzip, and --zstd.  For reference, these were added to GNU
  Tar as follows:

  c10830a (Add xz support., 2009-03-04), tar-1.22 (2009-03-05)
  bffe107 (Add Lzip support, 2010-03-02), tar-1.23 (2010-03-10)
  3d45373 (Add support for zstd compression, 2018-03-18), tar-1.32 (2019-02-23)

Signed-off-by: Todd Zullinger <tmz@pobox.com>
---

Hi all,

As I mentioned in the commit message, I ran into this test failure when
I tried building for CentOS/RHEL 8.  While this solves that particular
issue, it did raise a few questions which I thought were worth answering
before applying this patch as-is.

Does cgit intend require GNU tar?  If not, perhaps we should instead
justify this primarily for compatibility with a wider range of tar
implementations in addition to supporting older versions of GNU tar?  (I
haven't looked at or tested on systems which use a non-GNU tar, so there
are posibly other issues with our tar invocations apart from these
compression shortcut options.  Finding and fixing that can be a
#lefoverbit for anyone more familiar with such a system(s).)

I'd be happy to make such an adjustment to the other tests and commit
message(s).  I think this would all fit nicely in a single commit, but I
can split it in one for each of the three current compression algorithms
which use the --$algo shortcuts if that's preferred.

If we wanted to convert all the tests to use a decompress pipe into tar,
I could do that instead.  The latter would likely be less to ensure
support for different tar implemtations and more for consistency in the
test suite.  Whether that's worth the churn is debatable. :)

Thanks,

 tests/t0107-snapshot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index c164d3e..5b5d727 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -151,7 +151,7 @@ test_expect_success ZSTD 'verify zstd format' '
 
 test_expect_success ZSTD 'untar' '
 	rm -rf master &&
-	tar --zstd -xf master.tar.zst
+	zstd -dcf master.tar.zst | tar -xf -
 '
 
 test_expect_success ZSTD 'count files' '

-- 
Todd

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-12-29 20:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-08 19:41 [RFC/PATCH] t0107: support older tar in zstd untar test Todd Zullinger
2020-08-10  2:26 ` Todd Zullinger
2020-12-29 19:18   ` [PATCH] t0107: support older and/or non-GNU tar Todd Zullinger
2020-12-29 20:05     ` Jason A. Donenfeld

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).