public inbox for util-linux@vger.kernel.org
 help / color / mirror / Atom feed
From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 2/2] tests: fix rename subdir check that was failing in travis
Date: Wed, 30 Jul 2014 22:44:31 +0100	[thread overview]
Message-ID: <1406756671-26805-2-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1406756671-26805-1-git-send-email-kerolasa@iki.fi>

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
realpath issue to happen.

Reference: https://travis-ci.org/karelzak/util-linux/builds/30538376
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 tests/ts/rename/subdir | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir
index f83b2bf..4ae7005 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}
 
-- 
2.0.3


  reply	other threads:[~2014-07-30 21:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-30 21:44 [PATCH 1/2] build-sys: remove swap-common.h from sys-utils/Makemodule.am Sami Kerola
2014-07-30 21:44 ` Sami Kerola [this message]
2014-07-31  5:57   ` [PATCH 2/2] tests: fix rename subdir check that was failing in travis Bernhard Voelker
2014-07-31  6:15     ` Sami Kerola

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1406756671-26805-2-git-send-email-kerolasa@iki.fi \
    --to=kerolasa@iki.fi \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox