From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 22 Mar 2007 20:29:30 +0000 (+0100)
Subject: Improve a test script.
X-Git-Tag: COREUTILS-6_9~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59e889f0f3e8cce31387e2e03ab9dfcf48b48955;p=thirdparty%2Fcoreutils.git

Improve a test script.
* tests/mv/hard-3: Check for 'ls' failure, too.
Generate more-useful debugging output when 'ls' fails.
---

diff --git a/ChangeLog b/ChangeLog
index e683675620..10e34552bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve a test script.
+	* tests/mv/hard-3: Check for 'ls' failure, too.
+	Generate more-useful debugging output when 'ls' fails.
+
 2007-03-21  Jim Meyering  <jim@meyering.net>
 
 	Fix a test script not to claim an ext2 file system is of type xfs.
diff --git a/tests/mv/hard-3 b/tests/mv/hard-3
index 0ab9521fa2..b912da34f8 100755
--- a/tests/mv/hard-3
+++ b/tests/mv/hard-3
@@ -2,7 +2,7 @@
 # Ensure that using `cp --preserve=link' to copy hard-linked arguments
 # onto existing destinations works, even when one of the link operations fails.
 
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -78,12 +78,12 @@ test -f x/b || fail=1
 test -f c || fail=1
 
 # The i-node numbers of a and c must be the same.
-ia=`ls -i a|sed 's/ a$//'`
-ic=`ls -i c|sed 's/ c$//'`
-test $ia = $ic || fail=1
+ia=`ls -i a` || fail=1; set x $ia; ia=$3
+ic=`ls -i c` || fail=1; set x $ic; ic=$3
+test "$ia" = "$ic" || fail=1
 
 # The i-node number of x/b must be different.
-ib=`ls -i x/b|sed 's/ x.b$//'`
-test $ia = $ib && fail=1
+ib=`ls -i x/b` || fail=1; set x $ib; ib=$3
+test "$ia" = "$ib" && fail=1
 
 (exit $fail); exit $fail