diff options
| author | Jean Delvare <jdelvare@suse.de> | 2014-01-18 20:22:44 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2014-01-18 20:22:44 +0100 |
| commit | d813126fa1c9789de894b2029a71ea4b1c2b4ade (patch) | |
| tree | 7097a30814036486cd0381eda1d91b3c710d3bf7 /test | |
| parent | 3e3345405914f812d82ea25cbc15f88346e1e8de (diff) | |
| download | quilt-d813126fa1c9789de894b2029a71ea4b1c2b4ade.tar.gz | |
empty-files.test: Coding style update
Use the same syntax for file testing as used in other test cases. It
is more readable and avoids having to add yet another condition for
$needs_shell.
Diffstat (limited to 'test')
| -rw-r--r-- | test/empty-files.test | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/test/empty-files.test b/test/empty-files.test index 2fc505a..eb2c1e6 100644 --- a/test/empty-files.test +++ b/test/empty-files.test @@ -43,9 +43,11 @@ > patching file emptied1 > > Now at patch patches/using-filenames.patch - $ if test -e deleted1; then if test -s deleted1; then echo "File deleted1 is not empty" ; else echo "File deleted1 is empty" ; fi ; else echo "File deleted1 does not exist" ; fi + $ [ ! -e deleted1 ] && echo "File deleted1 does not exist" > File deleted1 does not exist - $ if test -e emptied1; then if test -s emptied1; then echo "File emptied1 is not empty" ; else echo "File emptied1 is empty" ; fi ; else echo "File emptied1 does not exist" ; fi + $ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty" + $ [ ! -e emptied1 ] && echo "File emptied1 does not exist" + $ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty" > File emptied1 is empty $ quilt push @@ -54,9 +56,11 @@ > patching file emptied2 > > Now at patch patches/using-timestamps.patch - $ if test -e deleted2; then if test -s deleted2; then echo "File deleted2 is not empty" ; else echo "File deleted2 is empty" ; fi ; else echo "File deleted2 does not exist" ; fi + $ [ ! -e deleted2 ] && echo "File deleted2 does not exist" > File deleted2 does not exist - $ if test -e emptied2; then if test -s emptied2; then echo "File emptied2 is not empty" ; else echo "File emptied2 is empty" ; fi ; else echo "File emptied2 does not exist" ; fi + $ [ -e deleted2 -a ! -s deleted2 ] && echo "File deleted2 is empty" + $ [ ! -e emptied2 ] && echo "File emptied2 does not exist" + $ [ -e emptied2 -a ! -s emptied2 ] && echo "File emptied2 is empty" > File emptied2 is empty # Test quilt fold @@ -71,17 +75,21 @@ $ quilt fold < patches/using-filenames.patch > patching file deleted1 > patching file emptied1 - $ if test -e deleted1; then if test -s deleted1; then echo "File deleted1 is not empty" ; else echo "File deleted1 is empty" ; fi ; else echo "File deleted1 does not exist" ; fi + $ [ ! -e deleted1 ] && echo "File deleted1 does not exist" > File deleted1 does not exist - $ if test -e emptied1; then if test -s emptied1; then echo "File emptied1 is not empty" ; else echo "File emptied1 is empty" ; fi ; else echo "File emptied1 does not exist" ; fi + $ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty" + $ [ ! -e emptied1 ] && echo "File emptied1 does not exist" + $ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty" > File emptied1 is empty $ quilt fold < patches/using-timestamps.patch > patching file deleted2 > patching file emptied2 - $ if test -e deleted2; then if test -s deleted2; then echo "File deleted2 is not empty" ; else echo "File deleted2 is empty" ; fi ; else echo "File deleted2 does not exist" ; fi + $ [ ! -e deleted2 ] && echo "File deleted2 does not exist" > File deleted2 does not exist - $ if test -e emptied2; then if test -s emptied2; then echo "File emptied2 is not empty" ; else echo "File emptied2 is empty" ; fi ; else echo "File emptied2 does not exist" ; fi + $ [ -e deleted2 -a ! -s deleted2 ] && echo "File deleted2 is empty" + $ [ ! -e emptied2 ] && echo "File emptied2 does not exist" + $ [ -e emptied2 -a ! -s emptied2 ] && echo "File emptied2 is empty" > File emptied2 is empty # Test quilt refresh @@ -105,9 +113,11 @@ > patching file emptied1 > > Now at patch patches/using-filenames.patch - $ if test -e deleted1; then if test -s deleted1; then echo "File deleted1 is not empty" ; else echo "File deleted1 is empty" ; fi ; else echo "File deleted1 does not exist" ; fi + $ [ ! -e deleted1 ] && echo "File deleted1 does not exist" > File deleted1 does not exist - $ if test -e emptied1; then if test -s emptied1; then echo "File emptied1 is not empty" ; else echo "File emptied1 is empty" ; fi ; else echo "File emptied1 does not exist" ; fi + $ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty" + $ [ ! -e emptied1 ] && echo "File emptied1 does not exist" + $ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty" > File emptied1 is empty $ cat patches/using-filenames.patch |