summaryrefslogtreecommitdiff
path: root/source4/selftest/samba4_tests.sh
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-05-12 09:44:27 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-05-12 09:44:27 +1000
commitb869a525b1f40baf881a725e5632b39c99268d67 (patch)
tree594e53b6f5ad26e28ad8fe78d9119275e4ac319d /source4/selftest/samba4_tests.sh
parent00ebe3df811a9eb7737fa6278d8784500c35bd14 (diff)
parent5d02514f72c6c89bc28b4c5de3d95bb8a439b56e (diff)
downloadsamba-b869a525b1f40baf881a725e5632b39c99268d67.tar.gz
samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.bz2
samba-b869a525b1f40baf881a725e5632b39c99268d67.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 61c31dc7cf649bc6f2d14bc8637e50ead9b9210a)
Diffstat (limited to 'source4/selftest/samba4_tests.sh')
-rwxr-xr-xsource4/selftest/samba4_tests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 725fde2c7d..9c7e93906c 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -351,7 +351,7 @@ plantest "winreg.python" dc $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcer
plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
rm -rf $PREFIX/upgrade
-plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
+plantest "blackbox.upgrade" none $PYTHON setup/upgrade $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
rm -rf $PREFIX/provision
mkdir $PREFIX/provision
plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision" "$CONFIGURATION"