diff options
| author | Matthieu Patou <mat@matws.net> | 2010-10-18 22:23:00 +0400 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2010-10-18 19:50:03 +0000 |
| commit | 902e7288a738c0580c466ae4c5c503d604c66e6e (patch) | |
| tree | a7f75406d03208b8e672d512e9e97878c87ba1b3 /source4/selftest | |
| parent | b1a13e5e1453b6f776e0a35f293f4060c77fe59a (diff) | |
| download | samba-902e7288a738c0580c466ae4c5c503d604c66e6e.tar.gz samba-902e7288a738c0580c466ae4c5c503d604c66e6e.tar.bz2 samba-902e7288a738c0580c466ae4c5c503d604c66e6e.zip | |
selftest: use full path for selftest.pl instead of relative paths
FindBin on solaris8 with perl 5.04 has problem to get the path of the
called script if the script is called with a relative path.
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Mon Oct 18 19:50:03 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/wscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/selftest/wscript b/source4/selftest/wscript index 249db5e90b..2f4e4362e0 100644 --- a/source4/selftest/wscript +++ b/source4/selftest/wscript @@ -148,7 +148,8 @@ def cmd_testonly(opt): if os.path.exists(st_done): os.unlink(st_done) - cmd = '(${PERL} ../selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="${PYTHON} ./selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit' + # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8). + cmd = '(${PERL} %s/../selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="${PYTHON} ./selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit' % (os.getcwd()) if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT: cmd += ' | ${FORMAT_TEST_OUTPUT}' cmd = EXPAND_VARIABLES(opt, cmd) |