summaryrefslogtreecommitdiff
path: root/source4/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 /source4/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 'source4/selftest')
-rw-r--r--source4/selftest/wscript2
1 files changed, 1 insertions, 1 deletions
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: