Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the situation w.r.t. dynamically linking zlib and libpopt clear.
[rsync/rsync.git]
/
runtests.sh
diff --git
a/runtests.sh
b/runtests.sh
index
50f4c8b
..
31c4936
100755
(executable)
--- a/
runtests.sh
+++ b/
runtests.sh
@@
-125,6
+125,9
@@
set -e
RUNSHFLAGS='-e'
RUNSHFLAGS='-e'
+# for Solaris
+PATH="/usr/xpg4/bin/:$PATH"
+
if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
then
if set -x
if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
then
if set -x
@@
-139,12
+142,7
@@
echo "$0 running in `pwd`"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
-if testuser=`whoami`
-then
- :
-else
- testuser='(unknown)'
-fi
+testuser=`whoami || echo UNKNOWN`
echo " testuser=$testuser"
echo " os=`uname -a`"
echo " testuser=$testuser"
echo " os=`uname -a`"
@@
-222,7
+220,8
@@
do
maybe_discard_scratch
;;
77)
maybe_discard_scratch
;;
77)
- echo "SKIP $testbase"
+ # backticks will fill the whole file onto one line, which is a feature
+ echo "SKIP $testbase (`cat \"$scratchdir/whyskipped\"`)"
skipped=`expr $skipped + 1`
maybe_discard_scratch
;;
skipped=`expr $skipped + 1`
maybe_discard_scratch
;;