common: check if a given rename flag is supported in _requires_renameat2
PATCH 1/2 common: check if a given rename flag is supported in _requires_renameat2
Some testcases may require a special rename flag, such as RENAME_WHITEOUT, so add support check for if a given rename flag is supported in _requires_renameat2.
--- common/renameat2 | 41 +++++++++++++++++++++++++++++++++++++++-- tests/generic/024 | 13 +++---------- tests/generic/025 | 13 +++---------- tests/generic/078 | 13 +++---------- 4 files changed, 48 insertions(+), 32 deletions(-)
common/renameat2 +39 -2
@@ -103,10 +103,47 @@ _rename_tests() # _requires_renameat2() { + local flags=$1 + local rename_dir=$TEST_DIR/$$ + if test ! -x src/renameat2; then _notrun "renameat2 binary not found" fi - if ! src/renameat2 -t; then - _notrun "kernel doesn't support renameat2 syscall" + + if test -z "$flags"; then + src/renameat2 -t + [ $? -eq 0 ] || _notrun "kernel doesn't support renameat2 syscall" + return fi + + case $flags in + "noreplace") + mkdir $rename_dir + touch $rename_dir/foo + if ! src/renameat2 -t -n $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_NOREPLACE" + fi + ;; + "exchange") + mkdir $rename_dir + touch $rename_dir/foo $rename_dir/bar + if ! src/renameat2 -t -x $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_EXCHANGE" + fi + ;; + "whiteout") + mkdir $rename_dir + touch $rename_dir/foo $rename_dir/bar + if ! src/renameat2 -t -w $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_WHITEOUT" + fi + ;; + *) + _notrun "only support noreplace,exchange,whiteout rename flags, please check." + ;; + esac + rm -fr $rename_dir }
tests/generic/024 +3 -10
@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 noreplace _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo -if ! src/renameat2 -t -n $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_NOREPLACE" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -n rmdir $rename_dir
tests/generic/025 +3 -10
@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 exchange _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo $rename_dir/bar -if ! src/renameat2 -t -x $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_EXCHANGE" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -x rmdir $rename_dir
tests/generic/078 +3 -10
@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 whiteout _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo $rename_dir/bar -if ! src/renameat2 -t -w $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_WHITEOUT" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -w rmdir $rename_dir
Signature · 4 lines
1.8.3.1 -- kaixuxia
Quoted 6 lines · kaixuxia
Some testcases may require a special rename flag, such as
RENAME_WHITEOUT, so add support check for if a given rename flag is supported in_requires_renameat2.Signed-off-by kaixuxia <[email protected]>---
Looks mostly reasonable...
Quoted 48 lines
common/renameat2 | 41 +++++++++++++++++++++++++++++++++++++++-- tests/generic/024 | 13 +++---------- tests/generic/025 | 13 +++---------- tests/generic/078 | 13 +++---------- 4 files changed, 48 insertions(+), 32 deletions(-)common/renameat2 +28
-2@@ -103,10 +103,47 @@ _rename_tests() # _requires_renameat2() { + local flags=$1 + local rename_dir=$TEST_DIR/$$ + if test ! -x src/renameat2; then _notrun "renameat2 binary not found" fi - if ! src/renameat2 -t; then - _notrun "kernel doesn't support renameat2 syscall" + + if test -z "$flags"; then + src/renameat2 -t + [ $? -eq 0 ] || _notrun "kernel doesn't support renameat2 syscall" + return fi + + case $flags in + "noreplace") + mkdir $rename_dir + touch $rename_dir/foo + if ! src/renameat2 -t -n $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_NOREPLACE" + fi + ;; + "exchange") + mkdir $rename_dir + touch $rename_dir/foo $rename_dir/bar + if ! src/renameat2 -t -x $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_EXCHANGE" + fi + ;; + "whiteout") + mkdir $rename_dir
common/renameat2 _rename_tests() · line 147
Quoted 10 lines
common/renameat2 +10
-0+ touch $rename_dir/foo $rename_dir/bar + if ! src/renameat2 -t -w $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_WHITEOUT" + fi + ;; + *) + _notrun "only support noreplace,exchange,whiteout rename flags, please check." + ;; + esac
... but it seems like this could be simplified to reduce (duplicate) code. For example:
mkdir $rename_dir
touch $rename_dir/foo
cmd=""
case $flags in
"noreplace")
cmd="-n $rename_dir/foo $rename_dir/bar" ;;
"exchange")
touch $rename_dir/bar
cmd="-x $rename_dir/foo $rename_dir/bar" ;;
"whiteout")
touch $rename_dir/bar
cmd="-w $rename_dir/foo $rename_dir/bar" ;;
...
if ! src/renameat2 -t $cmd; then
rm -rf $rename_dir
_notrun "fs doesn't support renameat2"
fi
rm -rf $rename_dir
Hm?
Brian
Quoted 91 lines
common/renameat2 +1
-0+ rm -fr $rename_dir }tests/generic/024 +3
-10@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 noreplace _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo -if ! src/renameat2 -t -n $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_NOREPLACE" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -n rmdir $rename_dirtests/generic/025 +3
-10@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 exchange _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo $rename_dir/bar -if ! src/renameat2 -t -x $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_EXCHANGE" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -x rmdir $rename_dirtests/generic/078 +3
-10@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 whiteout _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo $rename_dir/bar -if ! src/renameat2 -t -w $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_WHITEOUT" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -w rmdir $rename_dirSignature · 4 lines
1.8.3.1 -- kaixuxia
Quoted 94 lines · Brian Foster
Quoted 6 lines · kaixuxia
Some testcases may require a special rename flag, such as
RENAME_WHITEOUT, so add support check for if a given rename flag is supported in_requires_renameat2.Signed-off-by kaixuxia <[email protected]>---
Looks mostly reasonable...
Quoted 48 lines
common/renameat2 | 41 +++++++++++++++++++++++++++++++++++++++-- tests/generic/024 | 13 +++---------- tests/generic/025 | 13 +++---------- tests/generic/078 | 13 +++---------- 4 files changed, 48 insertions(+), 32 deletions(-)common/renameat2 +28
-2@@ -103,10 +103,47 @@ _rename_tests() # _requires_renameat2() { + local flags=$1 + local rename_dir=$TEST_DIR/$$ + if test ! -x src/renameat2; then _notrun "renameat2 binary not found" fi - if ! src/renameat2 -t; then - _notrun "kernel doesn't support renameat2 syscall" + + if test -z "$flags"; then + src/renameat2 -t + [ $? -eq 0 ] || _notrun "kernel doesn't support renameat2 syscall" + return fi + + case $flags in + "noreplace") + mkdir $rename_dir + touch $rename_dir/foo + if ! src/renameat2 -t -n $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_NOREPLACE" + fi + ;; + "exchange") + mkdir $rename_dir + touch $rename_dir/foo $rename_dir/bar + if ! src/renameat2 -t -x $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_EXCHANGE" + fi + ;; + "whiteout") + mkdir $rename_dircommon/renameat2 _rename_tests() · line 147
Quoted 10 lines
common/renameat2 +10
-0+ touch $rename_dir/foo $rename_dir/bar + if ! src/renameat2 -t -w $rename_dir/foo $rename_dir/bar; then + rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir + _notrun "fs doesn't support RENAME_WHITEOUT" + fi + ;; + *) + _notrun "only support noreplace,exchange,whiteout rename flags, please check." + ;; + esac... but it seems like this could be simplified to reduce (duplicate) code. For example:
mkdir $rename_dir
touch $rename_dir/foo
cmd=""
case $flags in
"noreplace")
cmd="-n $rename_dir/foo $rename_dir/bar" ;;
"exchange")
touch $rename_dir/bar
cmd="-x $rename_dir/foo $rename_dir/bar" ;;
"whiteout")
touch $rename_dir/bar
cmd="-w $rename_dir/foo $rename_dir/bar" ;;
...
if ! src/renameat2 -t $cmd; then
rm -rf $rename_dir
_notrun"fs doesn't support renameat2"
fi
rm -rf $rename_dir
Quoted 2 lines
Hm?
Yeah, make more sense.
Quoted 93 lines
Brian
Quoted 91 lines
common/renameat2 +1
-0+ rm -fr $rename_dir }tests/generic/024 +3
-10@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 noreplace _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo -if ! src/renameat2 -t -n $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_NOREPLACE" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -n rmdir $rename_dirtests/generic/025 +3
-10@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 exchange _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo $rename_dir/bar -if ! src/renameat2 -t -x $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_EXCHANGE" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -x rmdir $rename_dirtests/generic/078 +3
-10@@ -29,20 +29,13 @@ _supported_fs generic _supported_os Linux _require_test -_requires_renameat2 +_requires_renameat2 whiteout _require_test_symlinks -rename_dir=$TEST_DIR/$$ -mkdir $rename_dir -touch $rename_dir/foo $rename_dir/bar -if ! src/renameat2 -t -w $rename_dir/foo $rename_dir/bar; then - rm -f $rename_dir/foo $rename_dir/bar; rmdir $rename_dir - _notrun "fs doesn't support RENAME_WHITEOUT" -fi -rm -f $rename_dir/foo $rename_dir/bar - # real QA test starts here +rename_dir=$TEST_DIR/$$ +mkdir $rename_dir _rename_tests $rename_dir -w rmdir $rename_dirSignature · 4 lines
1.8.3.1 -- kaixuxia
Signature · 1 line
kaixuxia