diff options
| author | Sami Kerola | 2014-07-30 23:21:08 +0200 |
|---|---|---|
| committer | Sami Kerola | 2014-07-31 08:11:57 +0200 |
| commit | a009e86e8edc311b2cf3f8baea151d34c687527c (patch) | |
| tree | da73df9b993d4ffa8e04b864d080dee58a525736 /tests/ts/rename | |
| parent | build-sys: remove swap-common.h from sys-utils/Makemodule.am (diff) | |
| download | kernel-qcow2-util-linux-a009e86e8edc311b2cf3f8baea151d34c687527c.tar.gz kernel-qcow2-util-linux-a009e86e8edc311b2cf3f8baea151d34c687527c.tar.xz kernel-qcow2-util-linux-a009e86e8edc311b2cf3f8baea151d34c687527c.zip | |
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>
Diffstat (limited to 'tests/ts/rename')
| -rwxr-xr-x | tests/ts/rename/subdir | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir index f83b2bf10..4ae7005a7 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} |