diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2014-08-04 13:22:10 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-08-08 16:21:46 -0700 |
| commit | 31a0dbb21ebfaa2b25f6b407cbdbb5da1509db29 (patch) | |
| tree | 640a9a3f6e4d7e473d3947dcfc47b6e1f9d74535 /tests | |
| parent | 76b72680017c836eff8805ea0339f7827ba3e561 (diff) | |
Regression test portability: xargs
Linux xarg complains about an empty input, while NetBSD xargs does not.
This breaks tests where xargs is in a pipe after a command that should
be tested. Make sure we test the first command without xargs
BUG: 764655
Change-Id: I754d7d52332221c462ce3594f4e8d8d62ae606d5
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8280
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/afr/gfid-mismatch.t | 3 | ||||
| -rwxr-xr-x | tests/bugs/bug-1046624.t | 1 | ||||
| -rw-r--r-- | tests/bugs/bug-765564.t | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/tests/basic/afr/gfid-mismatch.t b/tests/basic/afr/gfid-mismatch.t index 29951354a04..e22efec81cb 100644 --- a/tests/basic/afr/gfid-mismatch.t +++ b/tests/basic/afr/gfid-mismatch.t @@ -18,7 +18,8 @@ TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --entry-timeout=0 --att #Test TEST touch $M0/file TEST setfattr -n trusted.gfid -v 0sBfz5vAdHTEK1GZ99qjqTIg== $B0/brick0/file -TEST ! "find $M0/file | xargs stat" +TEST ! "find $M0/file" +TEST ! "stat $M0/file" #Cleanup EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 diff --git a/tests/bugs/bug-1046624.t b/tests/bugs/bug-1046624.t index 2bfa0745ce7..13ee45d2911 100755 --- a/tests/bugs/bug-1046624.t +++ b/tests/bugs/bug-1046624.t @@ -37,6 +37,7 @@ TEST `ln -s $M0/Dir $M0/Link2` TEST $CLI volume start $V0 force EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 +TEST `find $M0/ 2>/dev/null 1>/dev/null` TEST `find $M0/ | xargs stat 2>/dev/null 1>/dev/null` TEST stat $B0/${V0}-0/Link1 diff --git a/tests/bugs/bug-765564.t b/tests/bugs/bug-765564.t index 5e931d2d04c..fa8ead7f4f2 100644 --- a/tests/bugs/bug-765564.t +++ b/tests/bugs/bug-765564.t @@ -77,6 +77,7 @@ TEST mv $M0/h $M0/1; TEST $CLI volume start $V0 force; EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1; +find $M0 2>/dev/null 1>/dev/null; find $M0 | xargs stat 2>/dev/null 1>/dev/null; TEST rm_mv_correctness; |