rpms/tar
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Skip the test if genfile is unable to create

Browse Source
This commit is contained in:
Than Ngo 2020-02-05 16:26:39 +01:00
parent 3088cd4bde
commit 4d2c3f08a9
2 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
tar-1.32-testsuite-fix.patch Normal file
View File

@ -0,0 +1,73 @@
commit 14f00a2c7adefcbe50e85f6bf2ebce922e0dceb0
Author: Sergey Poznyakoff <gray@gnu.org>
Date: Mon Nov 25 08:01:04 2019 +0200
Testsuite fixes
* tests/sparse06.at: Skip the test if genfile is unable to create
sparse files.
* tests/sptrcreat.at: Likewise.
* tests/sptrdiff00.at: Likewise.
* tests/sptrdiff01.at: Likewise.
diff --git a/tests/sparse06.at b/tests/sparse06.at
index 650b4f5..ceb5abb 100644
--- a/tests/sparse06.at
+++ b/tests/sparse06.at
@@ -23,7 +23,7 @@ AT_KEYWORDS([sparse sparse06 chdir])
m4_define([check_pattern],[
rm -rf out archive.tar smallsparse && mkdir out
-genfile --sparse --quiet --file smallsparse $1
+genfile --sparse --quiet --file smallsparse $1 || AT_SKIP_TEST
tar -cSf archive.tar smallsparse
tar -xf archive.tar -C out
cmp smallsparse out/smallsparse
@@ -33,7 +33,7 @@ AT_TAR_CHECK([
AT_SEEKHOLE_PREREQ
TAR_OPTIONS="$TAR_OPTIONS --hole-detection=seek"
-genfile --sparse --file bigsparse 0 ABC 8G DEF
+genfile --sparse --file bigsparse 0 ABC 8G DEF || AT_SKIP_TEST
tar -cSf a bigsparse
test $? -eq 0 || exit 1
diff --git a/tests/sptrcreat.at b/tests/sptrcreat.at
index 2c730cc..d913ddf 100644
--- a/tests/sptrcreat.at
+++ b/tests/sptrcreat.at
@@ -35,7 +35,7 @@ AT_KEYWORDS([truncate filechange sparse sptr sptrcreat])
AT_TAR_CHECK([
genfile --sparse --block-size=1024 --file foo \
- 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ || AT_SKIP_TEST
genfile --file baz
genfile --run --checkpoint 3 --length 200m --truncate foo -- \
tar --sparse -vcf bar foo baz
diff --git a/tests/sptrdiff00.at b/tests/sptrdiff00.at
index 990c6fa..482e9e5 100644
--- a/tests/sptrdiff00.at
+++ b/tests/sptrdiff00.at
@@ -29,7 +29,7 @@ AT_KEYWORDS([truncate filechange sparse sptr sptrdiff diff])
# This triggers short read in check_sparse_region.
AT_TAR_CHECK([
genfile --sparse --block-size=1024 --file foo \
- 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ || AT_SKIP_TEST
genfile --file baz
echo creating
tar --sparse -vcf bar foo baz
diff --git a/tests/sptrdiff01.at b/tests/sptrdiff01.at
index fcada14..81232a1 100644
--- a/tests/sptrdiff01.at
+++ b/tests/sptrdiff01.at
@@ -29,7 +29,7 @@ AT_KEYWORDS([truncate filechange sparse sptr sptrdiff diff])
# This triggers short read in check_data_region.
AT_TAR_CHECK([
genfile --sparse --block-size=1024 --file foo \
- 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ || AT_SKIP_TEST
genfile --file baz
echo creating
tar --sparse -vcf bar foo baz

6
tar.spec
View File

@ -5,7 +5,7 @@ Summary: A GNU file archiving program
Name: tar
Epoch: 2
Version: 1.32
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/tar/
@ -18,6 +18,7 @@ Patch2: tar-1.28-vfatTruncate.patch
Patch3: tar-1.29-wildcards.patch
Patch4: tar-1.28-atime-rofs.patch
Patch9: tar-1.28-document-exclude-mistakes.patch
Patch10: tar-1.32-testsuite-fix.patch
BuildRequires: gcc
BuildRequires: autoconf automake texinfo gettext libacl-devel
@ -112,6 +113,9 @@ make check || (
%changelog
* Wed Feb 05 2020 Than Ngo <than@redhat.com> - 2:1.32-4
- Skip the test if genfile is unable to create
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.32-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild