t6031-merge-recursive: More fixes for exec bit challenged filesystems
commit278924204288aa622d1ab319eaee08d8972d2d2b
authorJohannes Sixt <j6t@kdbg.org>
Wed, 18 Mar 2009 12:31:38 +0000 (18 13:31 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Wed, 18 Mar 2009 12:31:38 +0000 (18 13:31 +0100)
tree2c11e220b0c153c7182e38f75f67ef0becfb8bf3
parentbf09f21ae48c0daec7ea17573465aea800b13a8f
t6031-merge-recursive: More fixes for exec bit challenged filesystems

Commit 28f880241782024ecb212f1641c8dc487124523b improved the tests to
work on filesystems that do not honor the exec bit, but it didn't go the
full nine yards: If chmod +x does not work, then test -x will not work
reliably, either, which was the only way how the tests checked the result.
This patch works around the issue by testing the index if the filesystem
does not report that the exec bit is set.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
t/t6031-merge-recursive.sh