diff --git a/tar.changes b/tar.changes index 3400413..1d996da 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Oct 14 10:40:36 UTC 2021 - Bernhard Voelker + +- tests-skip-time01-on-32bit-time_t.patch: Add patch to skip test + 'tests/time01.at' on platforms with 32-bit time_t for now. +- tar.spec: Reference it. + (%check): Output the testsuite.log in case the testsuite failed. + ------------------------------------------------------------------- Fri Oct 8 09:45:09 UTC 2021 - Danilo Spinella diff --git a/tar.spec b/tar.spec index 7abea24..753d8c4 100644 --- a/tar.spec +++ b/tar.spec @@ -41,6 +41,7 @@ Patch3: %{name}-ignore_lone_zero_blocks.patch Patch4: %{name}-recursive--files-from.patch Patch5: add_readme-tests.patch Patch6: tar-PIE.patch +Patch7: tests-skip-time01-on-32bit-time_t.patch BuildRequires: automake >= 1.15 BuildRequires: libacl-devel BuildRequires: libselinux-devel @@ -110,6 +111,7 @@ it may as well access remote devices or files. #%patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter -fPIE @@ -134,7 +136,7 @@ cd - %if !0%{?qemu_user_space_build:1} # Checks disabled in qemu because of races happening when we emulate # multi-threaded programs -%make_build check +%make_build check || { cat tests/testsuite.log; exit 1; } %endif %install diff --git a/tests-skip-time01-on-32bit-time_t.patch b/tests-skip-time01-on-32bit-time_t.patch new file mode 100644 index 0000000..e6bf29b --- /dev/null +++ b/tests-skip-time01-on-32bit-time_t.patch @@ -0,0 +1,36 @@ +Skip some parts of 'tests/time01.at' on some platforms. + +This test fails if coreutils' touch was built with 64-bit time_t, +while tar was built with 32-bit time_t. This is currently the case +on i586, ppc and armv7l. Skip the failing last command on those +platforms. + +The failure was seen since coreutils-9.0. + +Discussed at: + https://lists.gnu.org/r/bug-tar/2021-10/msg00006.html + +Remove this patch once tar(1) also builds with 64-bit time_t. +--- + tests/time01.at | 8 ++++++++ + 1 file changed, 8 insertions(+) + +Index: tar-1.34/tests/time01.at +=================================================================== +--- tar-1.34.orig/tests/time01.at ++++ tar-1.34/tests/time01.at +@@ -61,6 +61,14 @@ do + done + + tar -c -f archive.tar dir ++ ++case "$( uname -m )" in ++ i686 | ppc | armv7l) ++ # "SUSE: disabled for now on platforms with 32-bit time_t" ++ AT_SKIP_TEST ++ ;; ++esac ++ + tar -d -f archive.tar dir + ], + [0],