[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 933ca4183e9e5f6d7be07e914cfe5cfed40c7cb5
Author: Akim Demaille <demaille at gostai.com>
Date:   Mon Dec 15 16:42:25 2008 +0100

    Make failure more readable.
    
    	* test/t.chmod_dev, test/t.mknod, test/t.touchinstall: Display the
    	output before checking it.

diff --git a/test/t.chmod_dev b/test/t.chmod_dev
index 27baa76..d4ea155 100755
--- a/test/t.chmod_dev
+++ b/test/t.chmod_dev
@@ -3,6 +3,6 @@
 
 mkdir $tmp
 run_fakeroot -- \
-    ${posixshell} -c 'mknod $tmp/hda3 b 3 0 && chmod 644 $tmp/hda3 && ls -ld $tmp/hda3' | grep "^b"
-TEMP=$?
-exit $TEMP
+    ${posixshell} -c 'mknod $tmp/hda3 b 3 0 && chmod 644 $tmp/hda3 && ls -ld $tmp/hda3' > $tmp/out
+cat $tmp/out
+exec grep '^b' $tmp/out
diff --git a/test/t.mknod b/test/t.mknod
index 58587a5..52c0837 100755
--- a/test/t.mknod
+++ b/test/t.mknod
@@ -1,5 +1,9 @@
 #!/bin/sh
 . ./defs || exit 1
 
+mkdir $tmp
 run_fakeroot -- \
-  ${posixshell} -c 'mknod hda3 b 3 1; ls -l hda3' | grep "^b"
+  ${posixshell} -c 'mknod hda3 b 3 1; ls -l hda3' >$tmp/out
+cat $tmp/out
+exec grep "^b" $tmp/out
+
diff --git a/test/t.touchinstall b/test/t.touchinstall
index 4c61599..d959fb1 100755
--- a/test/t.touchinstall
+++ b/test/t.touchinstall
@@ -2,8 +2,7 @@
 . ./defs || exit 1
 
 mkdir $tmp
-
 run_fakeroot -- \
- ${posixshell} -c "touch $tmp/iamnotuser; ls -al $tmp/iamnotuser" | grep root
-TEMP=$?
-exit $TEMP
+ ${posixshell} -c "touch $tmp/iamnotuser; ls -al $tmp/iamnotuser" >$tmp/out
+cat $tmp/out
+exec grep root $tmp/out

-- 
fakeroot