summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/client/tests/test_cifsdd.sh2
-rwxr-xr-xsource4/client/tests/test_smbclient.sh2
-rw-r--r--source4/scripting/devel/selftest-vars.sh2
-rw-r--r--source4/selftest/wscript2
-rwxr-xr-xsource4/torture/tests/test_gentest.sh2
-rwxr-xr-xsource4/torture/tests/test_locktest.sh2
-rwxr-xr-xsource4/torture/tests/test_masktest.sh2
-rwxr-xr-xsource4/utils/tests/test_nmblookup.sh2
-rwxr-xr-xsource4/utils/tests/test_samba_tool.sh2
9 files changed, 9 insertions, 9 deletions
diff --git a/source4/client/tests/test_cifsdd.sh b/source4/client/tests/test_cifsdd.sh
index 2268b6a091..448e4218bd 100755
--- a/source4/client/tests/test_cifsdd.sh
+++ b/source4/client/tests/test_cifsdd.sh
@@ -16,7 +16,7 @@ DOMAIN=$4
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
DD="$samba4bindir/cifsdd$EXEEXT"
SHARE=tmp
diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh
index 66cc2d9d9c..76ca5b960b 100755
--- a/source4/client/tests/test_smbclient.sh
+++ b/source4/client/tests/test_smbclient.sh
@@ -18,7 +18,7 @@ PREFIX=$5
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
diff --git a/source4/scripting/devel/selftest-vars.sh b/source4/scripting/devel/selftest-vars.sh
index 38e8a40acb..c4827422df 100644
--- a/source4/scripting/devel/selftest-vars.sh
+++ b/source4/scripting/devel/selftest-vars.sh
@@ -22,7 +22,7 @@ export SERVER=localdc1
export WINBINDD_SOCKET_DIR=$PWD/st/dc/winbindd_socket
export SELFTEST_PREFIX=$PWD/st
export DOMAIN=SAMBADOMAIN
-export BUILDDIR=.
+export BINDIR=./bin
export DC_SERVER_IP=127.0.0.1
export SELFTEST_INTERFACES=127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8
export SOCKET_WRAPPER_DIR=$PWD/st/w
diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index e9c24b055f..50acef8769 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -169,7 +169,7 @@ def cmd_testonly(opt):
os.makedirs(env.SELFTEST_PREFIX, int('755', 8))
# We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
- cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=${srcdir} --exclude=${srcdir}/source4/selftest/skip --testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+ cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/source4/selftest/skip --testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
cmd += ' | ${FORMAT_TEST_OUTPUT}'
else:
diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
index b85636b2f7..9f6e60c307 100755
--- a/source4/torture/tests/test_gentest.sh
+++ b/source4/torture/tests/test_gentest.sh
@@ -18,7 +18,7 @@ PREFIX=$5
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
gentest="$samba4bindir/gentest$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
diff --git a/source4/torture/tests/test_locktest.sh b/source4/torture/tests/test_locktest.sh
index a8f11ee0ba..e1d2a1ade4 100755
--- a/source4/torture/tests/test_locktest.sh
+++ b/source4/torture/tests/test_locktest.sh
@@ -18,7 +18,7 @@ PREFIX=$5
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
locktest="$samba4bindir/locktest$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
diff --git a/source4/torture/tests/test_masktest.sh b/source4/torture/tests/test_masktest.sh
index e4fa65ccfb..b3362e8960 100755
--- a/source4/torture/tests/test_masktest.sh
+++ b/source4/torture/tests/test_masktest.sh
@@ -18,7 +18,7 @@ PREFIX=$5
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
masktest="$samba4bindir/masktest$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
diff --git a/source4/utils/tests/test_nmblookup.sh b/source4/utils/tests/test_nmblookup.sh
index e2230e162f..b6ab7e01e5 100755
--- a/source4/utils/tests/test_nmblookup.sh
+++ b/source4/utils/tests/test_nmblookup.sh
@@ -26,7 +26,7 @@ testit() {
return $status
}
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
nmblookup="$samba4bindir/nmblookup$EXEEXT"
testit "nmblookup -U \$SERVER_IP \$SERVER" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $SERVER
diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh
index 0fb4c2afa8..2191d8a69d 100755
--- a/source4/utils/tests/test_samba_tool.sh
+++ b/source4/utils/tests/test_samba_tool.sh
@@ -9,7 +9,7 @@ shift 4
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT"
samba_tool="$samba4bindir/samba-tool$EXEEXT"