[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2203-gfae921e

[Jelmer Vernooij]

The branch, master has been updated
       via  fae921e93821329605c8fecacda8eebb768af2f8 (commit)
       via  6b0e6fc0b35b438675bc8d5827d97070d66fac04 (commit)
      from  9af9a43464d5e900b16b9ef29bbe516e70867e90 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fae921e93821329605c8fecacda8eebb768af2f8
Author: Timur I Bakeyev <timur at com.bat.ru>
Date:   Tue Jun 9 20:45:03 2009 +0200

    Fix installation path of the subunit python modules.
    
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>

commit 6b0e6fc0b35b438675bc8d5827d97070d66fac04
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Jun 9 18:09:27 2009 +0200

    s4-tests: Add separate variable for tap2subunit.

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/config.mk |    2 +-
 source4/selftest/tests.sh          |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index f485ca8..a5e3f25 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -25,7 +25,7 @@ $(python_glue_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
 
 _PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -name "*.py")
 
-$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
+$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(subst ../lib/subunit/python,,$(pyfile))),$(pyfile))))
 
 EPYDOC_OPTIONS = --no-private --url http://www.samba.org/ --no-sourcecode
 
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index b65a6e3..b0717aa 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -62,6 +62,7 @@ plansmbtorturetest() {
 samba4srcdir="`dirname $0`/.."
 samba4bindir="$BUILDDIR/bin"
 smb4torture="$samba4bindir/smbtorture${EXEEXT}"
+TAP2SUBUNIT="$PERL $samba4srcdir/../lib/subunit/tap2subunit"
 $smb4torture -V
 
 bbdir=../testprogs/blackbox
@@ -291,9 +292,9 @@ if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
    echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
 elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
   for f in $samba4srcdir/../pidl/tests/*.pl; do
-     plantest "pidl.`basename $f .pl`" none $PERL $f "|" $PERL $samba4srcdir/../lib/subunit/tap2subunit
+     plantest "pidl.`basename $f .pl`" none $PERL $f "|" $TAP2SUBUNIT 
   done
- plantest "selftest.samba4.pl" none $PERL $samba4srcdir/../selftest/test_samba4.pl "|" $PERL $samba4srcdir/../lib/subunit/tap2subunit
+ plantest "selftest.samba4.pl" none $PERL $samba4srcdir/../selftest/test_samba4.pl "|" $TAP2SUBUNIT
 else 
    echo "Skipping pidl tests - Test::More not installed"
 fi


-- 
Samba Shared Repository