summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-05-08 05:59:15 +0200
committerVijay Bellur <vbellur@redhat.com>2015-05-08 05:55:52 -0700
commitbf8250bcca7f484269f64b6a73f9330d843b320b (patch)
treef6faa0d6433de884437b116aeb9875c61d7d8b79
parentfc199e1b6f9423b4dc0c9b34bf894ad66ffafabf (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 BUG: 1129939 Change-Id: Ia337c8a8e68a163ed527c0e4cbe313072ab1672b Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/10657 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