From dde946f72a758410a80e05bf5f8447426db0b4a4 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Tue, 17 Mar 2015 20:40:58 +0100 Subject: Tests: ls portability regarding dot-files When run as root, BSD ls(1) lists dot-files, which includes .glusterfs in split-brain-healing.t's usage. This leads to failure. gfid-self-heal.t suffers the same problem. Fix by filtering out dot-files in ls(1) output NB: split-brain-healing.t also requires http://review.gluster.org/9831 to pass on NetBSD. BUG: 1129939 Change-Id: Ic572d3abf685e9b43f32ddee8a13b5f5c4ae641f Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/9885 Tested-by: Gluster Build System Reviewed-by: Ravishankar N Reviewed-by: Kaleb KEITHLEY --- tests/basic/afr/split-brain-healing.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/basic/afr/split-brain-healing.t') diff --git a/tests/basic/afr/split-brain-healing.t b/tests/basic/afr/split-brain-healing.t index bed33727a22..4132d327511 100644 --- a/tests/basic/afr/split-brain-healing.t +++ b/tests/basic/afr/split-brain-healing.t @@ -40,8 +40,8 @@ do echo "Initial content">>file$i done -replica_0_files_list=(`ls $B0/${V0}1`) -replica_1_files_list=(`ls $B0/${V0}3`) +replica_0_files_list=(`ls $B0/${V0}1|grep -v '^\.'`) +replica_1_files_list=(`ls $B0/${V0}3|grep -v '^\.'`) ############ Create data split-brain in the files. ########################### TEST kill_brick $V0 $H0 $B0/${V0}1 -- cgit