Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest
[kai/samba-autobuild/.git] / source4 / selftest / tests.sh
similarity index 99%
rename from source4/selftest/samba4_tests.sh
rename to source4/selftest/tests.sh
index 9fc71a104f4006199d3ed17602aadcf67a1635c3..fa799f51ffde2ef12977db2a75256f3db9dd17d8 100755 (executable)
@@ -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
 smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
 
@@ -263,7 +261,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" none $samba4srcdir/librpc/tests/test_ndrdump.sh
 plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"