svn commit: samba r24875 - in branches/SAMBA_4_0: . source/selftest
jelmer at samba.org
jelmer at samba.org
Sat Sep 1 23:57:35 GMT 2007
Author: jelmer
Date: 2007-09-01 23:57:34 +0000 (Sat, 01 Sep 2007)
New Revision: 24875
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24875
Log:
Use more absolute paths to samba4 binaries.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/selftest/test_cifs.sh
branches/SAMBA_4_0/source/selftest/test_echo.sh
branches/SAMBA_4_0/source/selftest/test_local.sh
branches/SAMBA_4_0/source/selftest/test_posix.sh
branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh
branches/SAMBA_4_0/source/selftest/tests_quick.sh
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/selftest/test_cifs.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_cifs.sh 2007-09-01 23:25:44 UTC (rev 24874)
+++ branches/SAMBA_4_0/source/selftest/test_cifs.sh 2007-09-01 23:57:34 UTC (rev 24875)
@@ -8,8 +8,8 @@
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
Modified: branches/SAMBA_4_0/source/selftest/test_echo.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_echo.sh 2007-09-01 23:25:44 UTC (rev 24874)
+++ branches/SAMBA_4_0/source/selftest/test_echo.sh 2007-09-01 23:57:34 UTC (rev 24875)
@@ -10,7 +10,7 @@
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 @@
"--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 "$*"
Modified: branches/SAMBA_4_0/source/selftest/test_local.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_local.sh 2007-09-01 23:25:44 UTC (rev 24874)
+++ branches/SAMBA_4_0/source/selftest/test_local.sh 2007-09-01 23:57:34 UTC (rev 24875)
@@ -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
Modified: branches/SAMBA_4_0/source/selftest/test_posix.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_posix.sh 2007-09-01 23:25:44 UTC (rev 24874)
+++ branches/SAMBA_4_0/source/selftest/test_posix.sh 2007-09-01 23:57:34 UTC (rev 24875)
@@ -8,9 +8,9 @@
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
Modified: branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh 2007-09-01 23:25:44 UTC (rev 24874)
+++ branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh 2007-09-01 23:57:34 UTC (rev 24875)
@@ -17,4 +17,4 @@
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
Modified: branches/SAMBA_4_0/source/selftest/tests_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/tests_quick.sh 2007-09-01 23:25:44 UTC (rev 24874)
+++ branches/SAMBA_4_0/source/selftest/tests_quick.sh 2007-09-01 23:57:34 UTC (rev 24875)
@@ -20,10 +20,10 @@
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 @@
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
More information about the samba-cvs
mailing list