Move selftest code to top-level.

[kai/samba-autobuild/.git] / source4 / selftest / tests.sh

diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/tests.sh
similarity index 99%
rename from source4/selftest/samba4_tests.sh
rename to source4/selftest/tests.sh
index 3c2bb134b0ad9574bb920e571394a34102ca5a03..eff06f588e0adb4788298ccd6a11c5c5cfa0e657 100755 (executable)
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/tests.sh
@@ -23,8 +23,6 @@ then
        PERL=perl
 fi
 
-incdir=`dirname $0`
-
 plantest() {
        name=$1
        env=$2
@@ -56,9 +54,9 @@ plansmbtorturetest() {
        plantest "$modname" "$env" $cmdline
 }
 
-$incdir/../bin/smbtorture -V
+bin/smbtorture -V
 
-samba4srcdir=$incdir/..
+samba4srcdir=.
 samba4bindir=$samba4srcdir/bin
 SCRIPTDIR=$samba4srcdir/../testprogs/ejs
 smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
@@ -267,7 +265,7 @@ fi
 # the API. These mainly test that the various command-line options of commands 
 # work correctly.
 
-bbdir=$incdir/../../testprogs/blackbox
+bbdir=../testprogs/blackbox
 
 plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh
 plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"