The branch, master has been updated
via 902e728 selftest: use full path for selftest.pl instead of relative
paths
via b1a13e5 selftest: correct the import of Time::HighRes
from 8556602 ldb:"ldb_schema_attribute_by_name_internal" - switch back
to 32bit counters
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 902e7288a738c0580c466ae4c5c503d604c66e6e
Author: Matthieu Patou <m...@matws.net>
Date: Mon Oct 18 22:23:00 2010 +0400
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 <m...@samba.org>
Autobuild-Date: Mon Oct 18 19:50:03 UTC 2010 on sn-devel-104
commit b1a13e5e1453b6f776e0a35f293f4060c77fe59a
Author: Matthieu Patou <m...@matws.net>
Date: Mon Oct 18 20:21:12 2010 +0400
selftest: correct the import of Time::HighRes
The "use" is always evaluated first even if enclosed into a if. So
on plateform without Time::Hires (ie. sun8 in the build farm). This
leads to an error.
Instead we use the synthax require Module + Module->import("function")
-----------------------------------------------------------------------
Summary of changes:
selftest/selftest.pl | 5 +++--
source4/selftest/wscript | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 08ee52c..7431bed 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -135,9 +135,10 @@ use SocketWrapper;
eval {
require Time::HiRes;
+Time::HiRes->import("time");
};
-unless ($@) {
- use Time::HiRes qw(time);
+if ($@) {
+ print "You don't have Time::Hires installed !\n";
}
my $opt_help = 0;
diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 249db5e..2f4e436 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)
--
Samba Shared Repository
