mirror of
https://git.savannah.gnu.org/git/tar.git
synced 2026-09-19 22:54:15 +00:00
Fix --one-top-level used together with --list.
* src/extract.c: Move one_top_level stuff to tar.c (decode_options). * src/tar.c (option_conflict_error): New function. (decode_options): Use option_conflict_error to complain about conflicting options in a uniform manner. Process one_top_level options here. (request_stdin): Fix error message. * tests/onetop04.at: New testcase: check --one-top-level with --list. * tests/Makefile.am: Add new testcase. * tests/testsuite.at: Add new testcase.
This commit is contained in:
@@ -147,6 +147,7 @@ TESTSUITE_AT = \
|
||||
onetop01.at\
|
||||
onetop02.at\
|
||||
onetop03.at\
|
||||
onetop04.at\
|
||||
opcomp01.at\
|
||||
opcomp02.at\
|
||||
opcomp03.at\
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
#
|
||||
# Test suite for GNU tar.
|
||||
# Copyright 2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is part of GNU tar.
|
||||
#
|
||||
# GNU tar is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# GNU tar is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
AT_SETUP([tar --one-top-level --transform])
|
||||
AT_KEYWORDS([extract onetop onetop02])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
AT_SORT_PREREQ
|
||||
mkdir a
|
||||
genfile --file a/b
|
||||
genfile --file c
|
||||
tar cf a.tar a c
|
||||
tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort
|
||||
],
|
||||
[0],
|
||||
[a/
|
||||
a/b
|
||||
a/d
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
@@ -417,6 +417,7 @@ AT_BANNER([One top level])
|
||||
m4_include([onetop01.at])
|
||||
m4_include([onetop02.at])
|
||||
m4_include([onetop03.at])
|
||||
m4_include([onetop04.at])
|
||||
|
||||
AT_BANNER([Star tests])
|
||||
m4_include([star/gtarfail.at])
|
||||
|
||||
Reference in New Issue
Block a user