diff options
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/selftest/tests.sh | 2 | ||||
| -rwxr-xr-x | source4/setup/upgrade_from_s3 (renamed from source4/scripting/bin/upgrade_from_s3) | 0 |
2 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" diff --git a/source4/scripting/bin/upgrade_from_s3 b/source4/setup/upgrade_from_s3 index 7e1e1fd6eb..7e1e1fd6eb 100755 --- a/source4/scripting/bin/upgrade_from_s3 +++ b/source4/setup/upgrade_from_s3 |