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

[Kyle J. McKay]

The following commit has been merged in the master branch:
commit 04fd63dd583fdc58174281ca23413a8b1dc3d320
Author: Kyle J. McKay <mackyle at gmail.com>
Date:   Mon May 30 15:50:43 2011 -0700

    Make the tests work without relying on the presence of the GNU version of the getopt utility.
    
    (fakeroot mangles spaces in arguments when getopt is not the GNU version)

diff --git a/test/t.chmod_dev b/test/t.chmod_dev
index 2d4165f..6b63db0 100755
--- a/test/t.chmod_dev
+++ b/test/t.chmod_dev
@@ -2,7 +2,9 @@
 . ./defs || exit 1
 
 mkdir $tmp
+# fakeroot mangles spaces unless the getopt utility is the GNU version
+echo "mknod $tmp/hda3 b 3 0 && chmod 644 $tmp/hda3 && ls -ld $tmp/hda3" > $tmp/sh
 run_fakeroot -- \
-    ${posixshell} -c 'mknod $tmp/hda3 b 3 0 && chmod 644 $tmp/hda3 && ls -ld $tmp/hda3' > $tmp/out
+    ${posixshell} $tmp/sh > $tmp/out
 cat $tmp/out
 grep '^b' $tmp/out
diff --git a/test/t.mknod b/test/t.mknod
index 7a9648f..38ba27e 100755
--- a/test/t.mknod
+++ b/test/t.mknod
@@ -2,7 +2,9 @@
 . ./defs || exit 1
 
 mkdir $tmp
+# fakeroot mangles spaces unless the getopt utility is the GNU version
+echo "mknod $tmp/hda3 b 3 1; ls -l $tmp/hda3" >$tmp/sh
 run_fakeroot -- \
-  ${posixshell} -c 'mknod $tmp/hda3 b 3 1; ls -l $tmp/hda3' >$tmp/out
+  ${posixshell} $tmp/sh >$tmp/out
 cat $tmp/out
 grep "^b" $tmp/out
diff --git a/test/t.no_ld_preload b/test/t.no_ld_preload
index 44d01ac..5773d8d 100755
--- a/test/t.no_ld_preload
+++ b/test/t.no_ld_preload
@@ -2,10 +2,11 @@
 . ./defs || exit 1
 
 mkdir $tmp
+# fakeroot mangles spaces unless the getopt utility is the GNU version
+echo "touch $tmp/justafile &&
+      $LDPRELOADVAR= rm $tmp/justafile &&
+      mkdir $tmp/justafile &&
+      ls -ld $tmp/justafile" > $tmp/sh
 run_fakeroot -- \
- ${posixshell} -c "touch $tmp/justafile &&
-                   $LDPRELOADVAR= rm $tmp/justafile &&
-                   mkdir $tmp/justafile &&
-                   ls -ld $tmp/justafile" | grep "^d"
-TEMP=$?
-exit $TEMP
+ ${posixshell} $tmp/sh > $tmp/out
+grep "^d" $tmp/out
diff --git a/test/t.touchinstall b/test/t.touchinstall
index 04107cf..ed2bc41 100755
--- a/test/t.touchinstall
+++ b/test/t.touchinstall
@@ -2,7 +2,9 @@
 . ./defs || exit 1
 
 mkdir $tmp
+# fakeroot mangles spaces unless the getopt utility is the GNU version
+echo "touch $tmp/iamnotuser; ls -al $tmp/iamnotuser" > $tmp/sh
 run_fakeroot -- \
- ${posixshell} -c "touch $tmp/iamnotuser; ls -al $tmp/iamnotuser" >$tmp/out
+ ${posixshell} $tmp/sh >$tmp/out
 cat $tmp/out
 grep root $tmp/out

-- 
fakeroot