r24875: Use more absolute paths to samba4 binaries.

(This used to be commit d5a3ebef36a3feed73817269a41c146230c29de9)

diff --git a/source4/selftest/test_cifs.sh b/source4/selftest/test_cifs.sh
index 187a6e11d4e935086cf742545f3e356a763f444b..f24f8d7398998e723a6e24070edafe3f8635d255 100755 (executable)
--- a/source4/selftest/test_cifs.sh
+++ b/source4/selftest/test_cifs.sh
@@ -8,8 +8,8 @@ ADDARGS="$*"
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-raw=`bin/smbtorture --list | grep "^RAW-" | xargs`
-base=`bin/smbtorture --list | grep "^BASE-" | xargs`
+raw=`$samba4bindir/smbtorture --list | grep "^RAW-" | xargs`
+base=`$samba4bindir/smbtorture --list | grep "^BASE-" | xargs`
 tests="$base $raw"
 
 for t in $tests; do

diff --git a/source4/selftest/test_echo.sh b/source4/selftest/test_echo.sh
index f09aeca4e59bb32595fac9b6f4e5d827e8632080..38bbec4f4e4e38b82908503d6e30b10ce5629d81 100755 (executable)
--- a/source4/selftest/test_echo.sh
+++ b/source4/selftest/test_echo.sh
@@ -10,7 +10,7 @@ for transport in $transports; do
   for ntlmoptions in \
         "--option=socket:testnonblock=True --option=torture:quick=yes"; do
    name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
-   plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" RPC-ECHO "$*"
+   plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" RPC-ECHO "$*"
   done
  done
 done
@@ -29,10 +29,10 @@ for transport in $transports; do
         "--option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no  --option=torture:quick=yes" \
     ; do
    name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
-   plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"
+   plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"
   done
  done
 done
 
 name="RPC-ECHO on ncacn_np over smb2"
-plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"\$SERVER[smb2]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"
+plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$SERVER[smb2]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"

diff --git a/source4/selftest/test_local.sh b/source4/selftest/test_local.sh
index ad8a5485295970c44105e1790aee13c3e831c98f..5f53b4efeda027be20a2d82a34585ddc384f4f4e 100755 (executable)
--- a/source4/selftest/test_local.sh
+++ b/source4/selftest/test_local.sh
@@ -3,7 +3,7 @@
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-for t in `bin/smbtorture --list | grep "^LOCAL-" | xargs`; do
+for t in `$samba4bindir/smbtorture --list | grep "^LOCAL-" | xargs`; do
        plantest "$t" none $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
 done
 

diff --git a/source4/selftest/test_posix.sh b/source4/selftest/test_posix.sh
index 3eff4825255bccaebe12c65c981645c1a607e903..383766cdf390fdeff798b5a285f1acd4f3e894e6 100755 (executable)
--- a/source4/selftest/test_posix.sh
+++ b/source4/selftest/test_posix.sh
@@ -8,9 +8,9 @@ ADDARGS="$*"
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-smb2=`bin/smbtorture --list | grep "^SMB2-" | xargs`
-raw=`bin/smbtorture --list | grep "^RAW-" | xargs`
-base=`bin/smbtorture --list | grep "^BASE-" | xargs`
+smb2=`$samba4bindir/smbtorture --list | grep "^SMB2-" | xargs`
+raw=`$samba4bindir/smbtorture --list | grep "^RAW-" | xargs`
+base=`$samba4bindir/smbtorture --list | grep "^BASE-" | xargs`
 tests="$base $raw $smb2"
 
 for t in $tests; do

diff --git a/source4/selftest/test_s3upgrade.sh b/source4/selftest/test_s3upgrade.sh
index db46d8922a2132ab5e4fff8e09680ffe49880604..692199acda8811efd4ae1eef06ba343fa10267bb 100755 (executable)
--- a/source4/selftest/test_s3upgrade.sh
+++ b/source4/selftest/test_s3upgrade.sh
@@ -17,4 +17,4 @@ SCRIPTDIR=$samba4srcdir/../testprogs/ejs
 DATADIR=$samba4srcdir/../testdata
 
 plantest "parse samba3" none $samba4bindir/smbscript $DATADIR/samba3/verify $CONFIGURATION $DATADIR/samba3
-#plantest "upgrade" none bin/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
+#plantest "upgrade" none $samba4bindir/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf

diff --git a/source4/selftest/tests_quick.sh b/source4/selftest/tests_quick.sh
index 71e1934c9a65e49cb06d5cfeb734313af2c132a4..8dbad5ae964f05b694a369a9c467f69924218d8e 100755 (executable)
--- a/source4/selftest/tests_quick.sh
+++ b/source4/selftest/tests_quick.sh
@@ -20,10 +20,10 @@ tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-RENAME"
 tests="$tests RAW-EAS RAW-STREAMS"
 
 for t in $tests; do
-    plantest "$t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
+    plantest "$t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
 done
 
-plantest "ntvfs/cifs BASE-OPEN" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" BASE-OPEN 
+plantest "ntvfs/cifs BASE-OPEN" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" BASE-OPEN 
 
 # add tests to this list as they start passing, so we test
 # that they stay passing
@@ -40,7 +40,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do
    esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
+    plantest "$name" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
    done
  done
 done