Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d820215
)
Try again to find the right directory on both local and farm builds.
author
Martin Pool
<mbp@samba.org>
Tue, 21 Aug 2001 13:10:18 +0000
(13:10 +0000)
committer
Martin Pool
<mbp@samba.org>
Tue, 21 Aug 2001 13:10:18 +0000
(13:10 +0000)
testsuite/master.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/master.test
b/testsuite/master.test
index
ffacc1e
..
ab0cd4f
100755
(executable)
--- a/
testsuite/master.test
+++ b/
testsuite/master.test
@@
-14,8
+14,8
@@
# build farm rsync will be installed, but into a scratch /usr.
# srcdir gives the location of the source tree, which lets us find the
# build farm rsync will be installed, but into a scratch /usr.
# srcdir gives the location of the source tree, which lets us find the
-# build scripts.
It might be relative, so we need to make it
-#
absolute
.
+# build scripts.
At the moment we assume we are invoked from the
+#
source directory
.
# testdir is a scratch directory for holding temporary test files.
# testdir is a scratch directory for holding temporary test files.
@@
-31,8
+31,8
@@
fi
testdir=`cd $testdir && pwd`
testdir=`cd $testdir && pwd`
-echo "srcdir is originally
$srcdir
"
-srcdir=`cd
$srcdir
&& pwd`
+echo "srcdir is originally
\"$srcdir\"
"
+srcdir=`cd
"$srcdir"
&& pwd`
echo "============================================================"
echo "$0 running in `pwd`"
echo "============================================================"
echo "$0 running in `pwd`"
@@
-50,15
+50,14
@@
missing=0
passed=0
failed=0
passed=0
failed=0
-suitedir="$srcdir/testsuite"
-cd "$suitedir"
+suitedir=`cd ./testsuite && pwd`
echo " suitedir=$suitedir"
. "$suitedir/config.sh"
for testbase in $test_names
do
echo " suitedir=$suitedir"
. "$suitedir/config.sh"
for testbase in $test_names
do
- testscript="
.
/$testbase.test"
+ testscript="
$suitedir
/$testbase.test"
if test \! -f "$testscript"
then
echo "$testscript does not exist" >&2
if test \! -f "$testscript"
then
echo "$testscript does not exist" >&2
@@
-69,7
+68,7
@@
do
echo "------------------------------------------------------------"
echo "----- $testbase running"
echo "------------------------------------------------------------"
echo "----- $testbase running"
- if sh
$testscript
+ if sh
"$testscript"
then
echo "----- $testbase completed succesfully"
passed=`expr $passed + 1`
then
echo "----- $testbase completed succesfully"
passed=`expr $passed + 1`