summaryrefslogtreecommitdiff
path: root/source3/selftest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-15 12:41:22 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-16 11:43:04 +0200
commit4fd6ebf544f90a6d18e6828eb3edc7b75f3b90a2 (patch)
tree5d3d75728d97688bb99f2200613ff46c66bfc6b5 /source3/selftest
parentcfb44f63a4eadfd34c0cf7b003b677e43284376f (diff)
downloadsamba-4fd6ebf544f90a6d18e6828eb3edc7b75f3b90a2.tar.gz
samba-4fd6ebf544f90a6d18e6828eb3edc7b75f3b90a2.tar.bz2
samba-4fd6ebf544f90a6d18e6828eb3edc7b75f3b90a2.zip
selftest: Remove duplication between BUILDIR and BINDIR
Just have BINDIR, and have it default to ./bin Andrew Bartlett
Diffstat (limited to 'source3/selftest')
-rwxr-xr-xsource3/selftest/s3-selftest.sh4
-rw-r--r--source3/selftest/wscript2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/selftest/s3-selftest.sh b/source3/selftest/s3-selftest.sh
index d2dad87ec2..00ed0c49ee 100755
--- a/source3/selftest/s3-selftest.sh
+++ b/source3/selftest/s3-selftest.sh
@@ -20,7 +20,7 @@ st_test_done() {
if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then
( rm -f ${SELFTESTPREFIX}/st_done && \
${PERL} ${SELFTESTDIR}/selftest.pl \
- --builddir=. --prefix=${SELFTESTPREFIX} --target=samba3 \
+ --prefix=${SELFTESTPREFIX} --target=samba3 \
--testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \
--exclude=${SOURCEDIR}/selftest/skip \
--srcdir="${SOURCEDIR}/.." \
@@ -33,7 +33,7 @@ if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then
else
( rm -f ${SELFTESTPREFIX}/st_done && \
${PERL} ${SELFTESTDIR}/selftest.pl \
- --builddir=. --prefix=${SELFTESTPREFIX} --target=samba3 \
+ --prefix=${SELFTESTPREFIX} --target=samba3 \
--testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \
--exclude=${SOURCEDIR}/selftest/skip \
--srcdir="${SOURCEDIR}/.." \
diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index 05d0d37238..db9233049f 100644
--- a/source3/selftest/wscript
+++ b/source3/selftest/wscript
@@ -166,7 +166,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 --target=samba3 --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=${srcdir} --exclude=${srcdir}/source3/selftest/skip --testlist="${srcdir}/source3/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+ cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=samba3 --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/source3/selftest/skip --testlist="${srcdir}/source3/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: