summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-03-03 16:22:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:09 -0500
commite8fe61e7aebd1cb5d493d8fcc70c1dab2c3c0bb0 (patch)
tree4f7c6b0102cc3ecf50bb44d6135c5dc4a35c4d04 /source4/script
parentdf1033b17ea7beaa351f9e0a766f8af3a09d2745 (diff)
downloadsamba-e8fe61e7aebd1cb5d493d8fcc70c1dab2c3c0bb0.tar.gz
samba-e8fe61e7aebd1cb5d493d8fcc70c1dab2c3c0bb0.tar.bz2
samba-e8fe61e7aebd1cb5d493d8fcc70c1dab2c3c0bb0.zip
r21679: Disable upgrade test for now, I can't get it to work.
(This used to be commit 4929c07261443887608a845de16f1fb786efb7ba)
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/tests/test_s3upgrade.sh13
1 files changed, 10 insertions, 3 deletions
diff --git a/source4/script/tests/test_s3upgrade.sh b/source4/script/tests/test_s3upgrade.sh
index 4419e37d80..580fd48821 100755
--- a/source4/script/tests/test_s3upgrade.sh
+++ b/source4/script/tests/test_s3upgrade.sh
@@ -7,9 +7,16 @@ then
exit 1
fi
+SCRIPTDIR=../testprogs/ejs
+DATADIR=../testdata
+
+PATH=bin:$PATH
+export PATH
+
mkdir -p $PREFIX
rm -f $PREFIX/*
-$VALGRIND bin/smbscript ../testprogs/ejs/samba3sam
-$VALGRIND bin/smbscript ../testdata/samba3/verify ../testdata/samba3
-$VALGRIND bin/smbscript setup/upgrade --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
+. script/tests/test_functions.sh
+
+testit "parse samba3" bin/smbscript ../testdata/samba3/verify $CONFIGURATION ../testdata/samba3
+#testit "upgrade" bin/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf