From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 30 Jul 2014 21:21:08 +0000 (+0100)
Subject: tests: fix rename subdir check that was failing in travis
X-Git-Tag: v2.26-rc1~558^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a009e86e8edc311b2cf3f8baea151d34c687527c;p=thirdparty%2Futil-linux.git

tests: fix rename subdir check that was failing in travis

Apparently some or all travis build servers has a bit older coreutils
version.  The coreutils v8.13 added a feature to readlink that allows
user to specify multiple arguments.  Earlier versions gave exactly the
type of error travis_script log has.

+readlink: extra operand `rename_aa/sublink.2'
+Try `readlink --help' for more information.

The commit 0f85e0535bd4e6d19fadca182e4d57660b6bb57b introduced the travis
readlink issue, and has caused failures for 8 days in row (builds 192 -
213).

Reference: https://travis-ci.org/karelzak/util-linux/builds
Reviewed-by: Bernhard Voelker <mail@bernhard-voelker.de>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir
index f83b2bf10c..4ae7005a7d 100755
--- a/tests/ts/rename/subdir
+++ b/tests/ts/rename/subdir
@@ -35,7 +35,9 @@ for i in rename_a{a,b}/sublink.{1..3}; do
 	ln -s rename/aa $i
 done
 $TS_CMD_RENAME -s -v a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>&1
-readlink rename_a{a,b}/sublink.?  >> $TS_OUTPUT 2>&1
+for i in rename_a{a,b}/sublink.?; do
+	readlink $i >> $TS_OUTPUT 2>&1
+done
 
 rm -rf rename_a{a,b}