From e8fe61e7aebd1cb5d493d8fcc70c1dab2c3c0bb0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 3 Mar 2007 16:22:05 +0000
Subject: r21679: Disable upgrade test for now, I can't get it to work. (This
 used to be commit 4929c07261443887608a845de16f1fb786efb7ba)

---
 source4/script/tests/test_s3upgrade.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'source4/script/tests')

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
-- 
cgit