summaryrefslogtreecommitdiff
path: root/source4/setup/tests/blackbox_s3upgrade.sh
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-12 20:21:53 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-12 20:52:00 +1000
commit8268c2d4e231b05b439bc70331b75342b35daa4e (patch)
treea105880fc0929d391a4a6d7afa059d3eb5759b2b /source4/setup/tests/blackbox_s3upgrade.sh
parent3e246a3cf47214b95fa7d45dafa24b98271c657b (diff)
downloadsamba-8268c2d4e231b05b439bc70331b75342b35daa4e.tar.gz
samba-8268c2d4e231b05b439bc70331b75342b35daa4e.tar.bz2
samba-8268c2d4e231b05b439bc70331b75342b35daa4e.zip
s4-s3-upgrade Remove upgrade_from_s3 script, use samba-tool domain samba3upgrade
Diffstat (limited to 'source4/setup/tests/blackbox_s3upgrade.sh')
-rwxr-xr-xsource4/setup/tests/blackbox_s3upgrade.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh
index 59bd70e811..44da3234bf 100755
--- a/source4/setup/tests/blackbox_s3upgrade.sh
+++ b/source4/setup/tests/blackbox_s3upgrade.sh
@@ -10,6 +10,9 @@ fi
PREFIX=`pwd`"/$1"
shift 1
+samba4bindir="$BINDIR"
+samba_tool="$samba4bindir/samba-tool$EXEEXT"
+
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
rm -rf $PREFIX/samba3-upgrade
@@ -35,7 +38,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
debug level = 0
EOF
-testit "samba3-upgrade-member" $PYTHON $SRCDIR/source4/setup/upgrade_from_s3 $PREFIX/samba3-upgrade/samba3/smb1.conf $PREFIX/samba3-upgrade/s4_1 --libdir=$PREFIX/samba3-upgrade/samba3
+testit "samba3-upgrade-member" $samba_tool domain samba3upgrade $PREFIX/samba3-upgrade/samba3/smb1.conf $PREFIX/samba3-upgrade/s4_1 --libdir=$PREFIX/samba3-upgrade/samba3
# Test 2 (s3 dc)
cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
@@ -56,7 +59,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
domain logons = yes
EOF
-testit "samba3-upgrade-dc" $PYTHON $SRCDIR/source4/setup/upgrade_from_s3 $PREFIX/samba3-upgrade/samba3/smb2.conf $PREFIX/samba3-upgrade/s4_2 --libdir=$PREFIX/samba3-upgrade/samba3
+testit "samba3-upgrade-dc" $samba_tool domain samba3upgrade $PREFIX/samba3-upgrade/samba3/smb2.conf $PREFIX/samba3-upgrade/s4_2 --libdir=$PREFIX/samba3-upgrade/samba3
rm -rf $PREFIX/samba3-upgrade