Changes to src/create.c and src/incremen.c are partially based on patch from Alexander Peslyak <solar at openwall.com>. The new testcases require paxutils commit f653a2b or later. * src/common.h (struct name): New member `cmdline'. (dump_file): Change type of the 2nd argument to bool. (file_removed_diag, dir_removed_diag): New prototypes. (addname): New argument `cmdline'. (name_from_list): Change return value. * src/create.c (dump_dir0, dump_dir): top_level is bool. (create_archive): Update calls to name_from_list. Take advantage of the name->cmdline to set top_level argument during incremental backups. (dump_file0): top_level is bool. Do not bail out if a no-top-level file disappears during incremental backup, use file_removed_diag instead. (dump_filed): top_level is bool. * src/incremen.c (update_parent_directory): Silently ignore ENOENT. It should have already been reported elsewhere. (scan_directory): Use dir_removed_diag to report missing directories. * src/misc.c (file_removed_diag, dir_removed_diag): New functions. * src/names.c (name_gather): Set ->cmdname. (addname): Likewise. All uses updated. (name_from_list): Return struct name const *. All uses updated. * tests/filerem01.at: New testcase. * tests/filerem02.at: New testcase. * tests/Makefile.am, tests/testsuite.at: Add filerem01.at, filerem02.at * tests/grow.at, test/truncate.at: Use new syntax for genfile --run. * NEWS: Update. * doc/tar.texi: Minor fix.
51 lines
1.7 KiB
Plaintext
51 lines
1.7 KiB
Plaintext
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
|
|
|
# Test suite for GNU tar.
|
|
# Copyright (C) 2009 Free Software Foundation, Inc.
|
|
|
|
# This program 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, or (at your option)
|
|
# any later version.
|
|
|
|
# This program 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/>.
|
|
|
|
# Description: see filerem01.at
|
|
# This test case checks if the tar exit code is still 2 if a
|
|
# file or directory disappears that is explicitly mentioned
|
|
# in the command line.
|
|
|
|
AT_SETUP([toplevel file removed (ca. 24 seconds)])
|
|
AT_KEYWORDS([create incremental filechange filerem filerem02])
|
|
|
|
AT_TAR_CHECK([
|
|
mkdir dir
|
|
mkdir dir/sub
|
|
genfile --file dir/file1
|
|
genfile --file dir/sub/file2
|
|
mkdir dir2
|
|
genfile --file dir2/file1
|
|
|
|
genfile --run --checkpoint=3 --exec 'rm -rf dir2' -- \
|
|
tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
|
|
--checkpoint-action='echo' -c -f archive.tar \
|
|
--listed-incremental db -v --warning=no-new-dir dir dir2 >/dev/null
|
|
],
|
|
[2],
|
|
[ignore],
|
|
[tar: dir2: Cannot stat: No such file or directory
|
|
tar: dir2/file1: File removed before we read it
|
|
tar: Exiting with failure status due to previous errors
|
|
],[],[],[gnu, posix])
|
|
|
|
# Timing information: see filerem01.at
|
|
|
|
AT_CLEANUP
|
|
|