summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-11-27 16:34:44 +0100
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-11-27 16:42:11 +0100
commit1af31aed0bd430d0af3a52962fa21f5c08309f01 (patch)
treee978f3045720f70f8aea5929782c42f74a7e14b2
parent04f8c229de7ffad5f4ec1a0bb68c2c8b4ccf4e15 (diff)
downloadsamba-1af31aed0bd430d0af3a52962fa21f5c08309f01.tar.gz
samba-1af31aed0bd430d0af3a52962fa21f5c08309f01.tar.bz2
samba-1af31aed0bd430d0af3a52962fa21f5c08309f01.zip
s4:tests.sh - Make also here the change from "upgrade" to "upgrade_from_s3"
-rwxr-xr-xsource4/selftest/tests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 724c9f2b9b..7c9b19f8f6 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -465,7 +465,7 @@ plantest "ldap.secdesc.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python"
plantest "ldap.acl.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/acl.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantest "blackbox.samba3dump" none $PYTHON $samba4srcdir/scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
rm -rf $PREFIX/upgrade
-plantest "blackbox.upgrade" none $PYTHON $samba4srcdir/setup/upgrade $CONFIGURATION --targetdir=$PREFIX/upgrade $samba4srcdir/../testdata/samba3 ../testdata/samba3/smb.conf
+plantest "blackbox.upgrade" none $PYTHON $samba4srcdir/scripting/bin/upgrade_from_s3 $CONFIGURATION --targetdir=$PREFIX/upgrade $samba4srcdir/../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"