summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-11-28 19:23:08 +0100
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-11-28 19:25:12 +0100
commitb973c5083699ad2b22c72fafe5c4b77f1f4eeccb (patch)
tree614d6264de8d9283635358df0d7c2f152b4fc2cc /source4/selftest
parentf0686645a99de226f199130fee07910d0f6462be (diff)
downloadsamba-b973c5083699ad2b22c72fafe5c4b77f1f4eeccb.tar.gz
samba-b973c5083699ad2b22c72fafe5c4b77f1f4eeccb.tar.bz2
samba-b973c5083699ad2b22c72fafe5c4b77f1f4eeccb.zip
s4:upgrade_from_s3 - Move it back to "setup"
Suggested by Jelmer
Diffstat (limited to 'source4/selftest')
-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 7c9b19f8f6..73209efefe 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/scripting/bin/upgrade_from_s3 $CONFIGURATION --targetdir=$PREFIX/upgrade $samba4srcdir/../testdata/samba3 ../testdata/samba3/smb.conf
+plantest "blackbox.upgrade" none $PYTHON $samba4srcdir/setup/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"