generic: Create new outfile for 035 over NFS
Subsystems (2)
PATCH 1/2 generic: Create new outfile for 035 over NFS
From: Anna Schumaker <[email protected]>
Rename-overwrites over NFS work with a "silly rename" over the network, so the nlink count stays at 1 instead of dropping to 0. This is expected behavior for NFS, so we should use a different golden output file to account for this.
See the NFS faq at: nfs.sourceforge.net/#faq_d2 for more information
about silly renames.
---
.gitignore | 1 +
common/rc | 2 +-
tests/generic/035 | 4 ++++
tests/generic/035.cfg | 1 +
tests/generic/{035.out => 035.out.default} | 0
tests/generic/035.out.nfs | 5 +++++
6 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 tests/generic/035.cfg
rename tests/generic/{035.out => 035.out.default} (100%)
create mode 100644 tests/generic/035.out.nfs.gitignore +1 -0
@@ -254,6 +254,7 @@ /dmapi/src/suite2/src/test_rights # Symlinked files +/tests/generic/035.out /tests/xfs/033.out /tests/xfs/071.out /tests/xfs/096.out
common/rc +1 -1
@@ -2848,7 +2848,7 @@ _link_out_file() local features if [ $# -eq 0 ]; then - features="$(_get_os_name)" + features="$(_get_os_name),$FSTYP" if [ -n "$MOUNT_OPTIONS" ]; then features=$features,${MOUNT_OPTIONS##"-o "} fi
tests/generic/035 +4 -0
@@ -6,6 +6,7 @@ # # Check overwriting rename system call # +seqfull=$0 seq=`basename $0` seqres=$RESULT_DIR/$seq echo "QA output created by $seq"
@@ -29,6 +30,9 @@ _supported_os Linux _require_test +# Select appropriate golden output based on fstype +_link_out_file + # real QA test starts here rename_dir=$TEST_DIR/$$
tests/generic/035.cfg new file +1 -0
@@ -0,0 +1 @@ +nfs: nfs
tests/generic/035.out.default renamed from tests/generic/035.out +0 -0
tests/generic/035.out.nfs new file +5 -0
@@ -0,0 +1,5 @@ +QA output created by 035 +overwriting regular file: +nlink is 1, should be 0 +overwriting directory: +t_rename_overwrite: fstat(3): Stale file handle
Signature · 1 line
2.23.0
PATCH 2/2 generic: 448 shouldn't delete $BASE_TEST_FILE if it isn't set yet
From: Anna Schumaker <[email protected]>
NFS v4.2 supports SEEK_DATA and SEEK_HOLE, but earlier versions do not. As a result, the test exits and runs the cleanup function without the $BASE_TEST_FILE variable set and the shell expands it to "rm -f .*", deleting all hidden files in the current directory.
--- tests/generic/448 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/generic/448 +2 -1
@@ -17,7 +17,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _cleanup() { - rm -f $tmp.* $BASE_TEST_FILE.* + rm -f $tmp.* + [ ! -z $BASE_TEST_FILE ] && rm -f $BASE_TEST_FILE.* } # get standard environment, filters and checks
Signature · 1 line
2.23.0
Re: [PATCH 2/2] generic: 448 shouldn't delete $BASE_TEST_FILE if it isn't set yet
Quoted 17 lines · On Fri, Oct 18, 2019 at 01:33:43PM -0400, [email protected] wrote:
From: Anna Schumaker <[email protected]>
NFS v4.2 supports
SEEK_DATAandSEEK_HOLE, but earlier versions do not. As a result, the test exits and runs the cleanup function without the $BASE_TEST_FILE variable set and the shell expands it to "rm -f .*", deleting all hidden files in the current directory.Signed-off-by Anna Schumaker <[email protected]>--- tests/generic/448 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)tests/generic/448 +0
-0
tests/generic/448 trap "_cleanup; exit \$status" 0 1 2 3 15 · line 22
Quoted 7 lines
tests/generic/448 +2
-1@@ -17,7 +17,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _cleanup() { - rm -f $tmp.* $BASE_TEST_FILE.* + rm -f $tmp.* + [ ! -z $BASE_TEST_FILE ] && rm -f $BASE_TEST_FILE.* }
I'd just define BASE_TEST_FILE before _cleanup (and did it on commit). Thanks for the fix!
Eryu
Quoted 5 lines
tests/generic/448 +0
-0# get standard environment, filters and checksSignature · 1 line
2.23.0