summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-05-08 06:03:28 +0200
committerVijay Bellur <vbellur@redhat.com>2015-05-08 11:10:57 -0700
commitc2f702c8207aaba17b0db19eb8f30cac669bf9a6 (patch)
tree79a211662cbbdfd6684f0703b8c5916f867ce233
parent599726fec2e5c59b16a5aeb947342d65c1fc967f (diff)
Tests: fix file count in ec-readdir.t
On BSD systems, ls(1) reports dot-files when it is run as root, while Linux ls(1) does not do that. In ec-readdir.t, this means the directory count is different because of .trashcan directory. Fix this by using ls $M0/* instead of ls $M0 Backport of: Ia337c8a8e68a163ed527c0e4cbe313072ab1672b BUG: 1212676 Change-Id: Ic3eb43f22a7c12a51e955b459af5159afc9835aa Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/10658 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--tests/basic/ec/ec-readdir.t2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/basic/ec/ec-readdir.t b/tests/basic/ec/ec-readdir.t
index d57bb2869c7..bbfa2ddca84 100644
--- a/tests/basic/ec/ec-readdir.t
+++ b/tests/basic/ec/ec-readdir.t
@@ -16,5 +16,5 @@ EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" ec_child_up_count $V0 0
EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" ec_child_up_count $V0 1
TEST touch $M0/{1..100}
-EXPECT "100" echo $(ls $M0 | wc -l)
+EXPECT "100" echo $(ls $M0/* | wc -l)
cleanup