[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. 08ed00124d8b6b445d3b91a9aa15eec638b02f05

[Clint Adams]

The following commit has been merged in the upstream branch:
commit fc31d1cbd9d46e1fa2c8d61548ef2a557ee4e8e5
Author: Akim Demaille <demaille at gostai.com>
Date:   Mon Dec 15 15:03:40 2008 +0100

    Improve test suite.
    
    	* tests/Makefile.am (check_SCRIPTS): Make sure "defs" is up to date.
    	* tests/defs.in: Depend on VERBOSE to decide whether to be verbose
    	or not.

diff --git a/test/Makefile.am b/test/Makefile.am
index bf2490f..0d99c67 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,5 +12,5 @@ TESTS_ENVIRONMENT =							\
 
 CLEANFILES = tmp* tartest.tar.gz hda3
 
-check_SCRIPTS = $(TESTS) echo_arg tartest compare-tar
+check_SCRIPTS = $(TESTS) echo_arg tartest compare-tar defs
 EXTRA_DIST = $(check_SCRIPTS) tartest.tar.gz.uue
diff --git a/test/defs.in b/test/defs.in
index 50d07da..439ac29 100644
--- a/test/defs.in
+++ b/test/defs.in
@@ -1,3 +1,5 @@
+#                                          -*- shell-script -*-
+
 me=`basename $0`
 tmp=$me.dir
 rm -rf $tmp
@@ -6,7 +8,16 @@ trap 'rm -rf $tmp' EXIT
 # The name of LD_PRELOAD on this platform.
 LDPRELOADVAR=@LDPRELOADVAR@
 
+case $VERBOSE in
+  (x)  set -x;;                # Debug mode.
+  ('') exec >/dev/null 2>&1;;  # By default, be silent.
+esac
+
 run_fakeroot ()
 {
-  tmp="$tmp" $PWD/../scripts/fakeroot${tcp} -f $PWD/../faked${tcp} -l $PWD/../.libs/${libfakeroot} "$@"
+  tmp="$tmp"                                    \
+  $PWD/../scripts/fakeroot${tcp}                \
+      -f $PWD/../faked${tcp}                    \
+      -l $PWD/../.libs/${libfakeroot}           \
+       "$@"
 }

-- 
fakeroot