tests: (rename) use long options to improve test coverage report

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/ts/rename/basic b/tests/ts/rename/basic
index 28d1a57b6823e596ebf4f0fff1514de59a1bc417..46aa61056f2dd8bbf6b64cc2e05915245634cee1 100755 (executable)
--- a/tests/ts/rename/basic
+++ b/tests/ts/rename/basic
@@ -25,7 +25,7 @@ ts_check_test_command "$TS_CMD_RENAME"
 ts_cd "$TS_OUTDIR"
 
 touch rename_basic.{1..3}
-$TS_CMD_RENAME -v basic test rename_basic.? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose basic test rename_basic.? >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 for i in rename_basic.?; do
        echo "what is $i doing here?" >> $TS_OUTPUT
@@ -40,7 +40,7 @@ done
 
 
 touch rename_all\ file\ with\ spaces.{1..3}
-$TS_CMD_RENAME -v -a ' ' '_' rename_all*.? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose --all ' ' '_' rename_all*.? >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 for i in rename_all*\ *.?; do
        echo "what is $i doing here?" >> $TS_OUTPUT
@@ -54,7 +54,7 @@ for i in rename_all_file_with_spaces.{1..3}; do
 done
 
 touch rename_zz_last_{z,z{,z{,z}}}.{x..z}
-$TS_CMD_RENAME -v -l zz AAzzBB rename_zz_last_* >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose --last zz AAzzBB rename_zz_last_* >> $TS_OUTPUT 2>> $TS_ERRLOG
 for i in rename_AAzzBB_last_z.x rename_AAzzBB_last_z.y rename_AAzzBB_last_z.z \
        rename_zz_last_AAzzBB.x rename_zz_last_AAzzBB.y rename_zz_last_AAzzBB.z \
        rename_zz_last_zAAzzBB.x rename_zz_last_zAAzzBB.y rename_zz_last_zAAzzBB.z ; do
@@ -69,11 +69,11 @@ for i in rename*last* ; do
 done
 
 touch rename_all_empty
-$TS_CMD_RENAME -v -a '' _ rename_all_empty >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose --all '' _ rename_all_empty >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f _r_e_n_a_m_e___a_l_l___e_m_p_t_y_
 
 mkdir rename_dir
-$TS_CMD_RENAME -v dir new_dir rename_dir/ >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose dir new_dir rename_dir/ >> $TS_OUTPUT 2>> $TS_ERRLOG
 rmdir rename_new_dir
 
 ts_finalize

diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir
index c3de0acfcdecda385f1a60e9ce35517c1c7cb4c8..adcc68e55e3725584c86e6425a420074f90f5129 100755 (executable)
--- a/tests/ts/rename/subdir
+++ b/tests/ts/rename/subdir
@@ -27,14 +27,14 @@ ts_cd "$TS_OUTDIR"
 echo "== files ==" >> $TS_OUTPUT
 mkdir rename_a{a,b}
 touch rename_a{a,b}/aa
-$TS_CMD_RENAME -v a x rename_a?/aa >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose a x rename_a?/aa >> $TS_OUTPUT 2>> $TS_ERRLOG
 find rename_a{a,b} >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 echo "== symlinks ==" >> $TS_OUTPUT
 for i in rename_a{a,b}/sublink.{1..3}; do
        ln -s rename/aa $i
 done
-$TS_CMD_RENAME -s -v a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --symlink --verbose a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>> $TS_ERRLOG
 for i in rename_a{a,b}/sublink.?; do
        readlink $i >> $TS_OUTPUT 2>> $TS_ERRLOG
 done
@@ -43,7 +43,7 @@ rm -rf rename_a{a,b}
 
 echo "== fullpath ==" >> $TS_OUTPUT
 touch rename_path1
-$TS_CMD_RENAME -v ./rename_path1 ./rename_path2 ./rename_path1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose ./rename_path1 ./rename_path2 ./rename_path1 >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 find . -name 'rename_path*' >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f ./rename_path*
@@ -51,14 +51,14 @@ rm -f ./rename_path*
 mkdir rename_path_a
 touch rename_path_test1
 
-$TS_CMD_RENAME -v rename_path_test1 rename_path_a/test1 rename_path_test1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose rename_path_test1 rename_path_a/test1 rename_path_test1 >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 find . -name '*test1*' >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f rename_path_test1 rename_path_a/test1
 
 mkdir rename_path_b
 touch rename_path_a/test2
-$TS_CMD_RENAME -v rename_path_a/test2 rename_path_b/test2 rename_path_a/test2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose rename_path_a/test2 rename_path_b/test2 rename_path_a/test2 >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 find rename_path_a rename_path_b >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f rename_path_a/test2 rename_path_b/test2
@@ -66,30 +66,30 @@ rm -f rename_path_a/test2 rename_path_b/test2
 rmdir rename_path_a rename_path_b
 
 ln -s some/nonexistent/path rename_link
-$TS_CMD_RENAME -s -v t/p _ rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_RENAME -s -v exist / rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_RENAME -s -v e x rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --symlink --verbose t/p _ rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --symlink --verbose exist / rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --symlink --verbose e x rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
 readlink rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm rename_link
 
 echo "== empty 'from' ==" >> $TS_OUTPUT
 
 touch rename_test
-$TS_CMD_RENAME -v '' _ rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose '' _ rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f *rename_test
 
 touch rename_test
-$TS_CMD_RENAME -v '' _ ./rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose '' _ ./rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f *rename_test
 
 touch rename_test
 mkdir rename_subdir
-$TS_CMD_RENAME -v '' rename_subdir/ rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose '' rename_subdir/ rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -rf rename_subdir
 
 touch rename_test
 mkdir rename_subdir
-$TS_CMD_RENAME -v '' rename_subdir/ ./rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose '' rename_subdir/ ./rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -rf rename_subdir
 
 ts_finalize

diff --git a/tests/ts/rename/symlink b/tests/ts/rename/symlink
index f775ada79daee18fadb3ffab4f7c7d883287c3f9..79e38cbb2ce59981517cc5bc76a4819b787b44a4 100755 (executable)
--- a/tests/ts/rename/symlink
+++ b/tests/ts/rename/symlink
@@ -28,7 +28,7 @@ for i in rename_slink.{1..3}; do
        ln -s old $i
 done
 
-$TS_CMD_RENAME -s -v old new rename_slink.? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --symlink --verbose old new rename_slink.? >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 for i in rename_slink.{1..3}; do
        where="$(readlink $i)"
@@ -40,7 +40,7 @@ done
 
 touch target
 ln -s target rename_slink.1
-$TS_CMD_RENAME -v slink symlink rename_slink.1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose slink symlink rename_slink.1 >> $TS_OUTPUT 2>> $TS_ERRLOG
 readlink rename_symlink.1 >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f rename_slink.1 rename_symlink.1
 
@@ -50,7 +50,7 @@ $TS_CMD_RENAME -v slink symlink rename_slink.2 >> $TS_OUTPUT 2>> $TS_ERRLOG
 readlink rename_symlink.2 >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f rename_slink.2 rename_symlink.2
 
-$TS_CMD_RENAME -v slink symlink rename_slink.3 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose slink symlink rename_slink.3 >> $TS_OUTPUT 2>> $TS_ERRLOG
 # The error may differ on Mac OS X due to faccessat()/lstat(); normalize it.
 sed -i -e 's/\(rename_slink.3\): not accessible/\1/' -e 's/stat of \(rename_slink.3\) failed/\1/' $TS_ERRLOG