From 3088e3e69874f4f25349e1870da5eeeb8a88e1ca Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 5 Mar 2023 09:09:46 -0500 Subject: [SV 63867] Don't use --sort to generate error report tar files Older versions of GNU tar parse the TAR_OPTIONS variable, but do not accept the --sort option: remove it before creating the error report tar files. Note we still require a modern GNU tar to create release tar files. Reported by Dmitry Goncharov * Makefile.am (check-regression): Remove --sort from TAR_OPTIONS --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 559f50f8..49bc06bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -191,6 +191,7 @@ check-regression: tests/config-flags.pm esac; \ echo "cd tests && $(PERL) $(PERLFLAGS) ./run_make_tests.pl -srcdir $(abs_top_srcdir) -make $(GMK_OUTDIR)/make$(EXEEXT) $(MAKETESTFLAGS)"; \ (cd tests && $(PERL) $(PERLFLAGS) ./run_make_tests.pl -srcdir '$(abs_top_srcdir)' -make '$(GMK_OUTDIR)/make$(EXEEXT)' $(MAKETESTFLAGS); echo $$? >.test-result) 2>&1 | tee $(testlog); \ + export TAR_OPTIONS='$(filter-out --sort%,$(TAR_OPTIONS))'; \ er=$$(cat $(testresult)); if test "$$er" -ne 0; then \ dirnm="$(errorpre)-$$($(rand_string))"; fnm="$$dirnm.tar.gz"; \ rm -rf "$$dirnm"; mkdir "$$dirnm"; \ -- cgit v1.2.1