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

---
 source/script/tests/test_s3upgrade.sh | 37 +++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 15 deletions(-)
 rewrite source/script/tests/test_s3upgrade.sh (63%)

diff --git a/source/script/tests/test_s3upgrade.sh b/source/script/tests/test_s3upgrade.sh
dissimilarity index 63%
index 4419e37d802..580fd48821c 100755
--- a/source/script/tests/test_s3upgrade.sh
+++ b/source/script/tests/test_s3upgrade.sh
@@ -1,15 +1,22 @@
-#!/bin/sh
-PREFIX=$1
-
-if [ -z "$PREFIX" ]
-then
-	echo "Usage: test_s3upgrade.sh <prefix>"
-	exit 1
-fi
-
-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
+#!/bin/sh
+PREFIX=$1
+
+if [ -z "$PREFIX" ]
+then
+	echo "Usage: test_s3upgrade.sh <prefix>"
+	exit 1
+fi
+
+SCRIPTDIR=../testprogs/ejs
+DATADIR=../testdata
+
+PATH=bin:$PATH
+export PATH
+
+mkdir -p $PREFIX
+rm -f $PREFIX/*
+
+. 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
-- 
2.11.4.GIT