From 4fd6ebf544f90a6d18e6828eb3edc7b75f3b90a2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 15 Apr 2011 12:41:22 +1000 Subject: selftest: Remove duplication between BUILDIR and BINDIR Just have BINDIR, and have it default to ./bin Andrew Bartlett --- source4/selftest/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/selftest') 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: -- cgit