[Libreoffice-commits] core.git: 3 commits - pyuno/Module_pyuno.mk solenv/gbuild

[David Tardon]

 pyuno/Module_pyuno.mk       |    8 +-------
 solenv/gbuild/PythonTest.mk |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 1a02692e7f87047e294e5a6699915227380fd60a
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 18 14:50:50 2014 +0200

    test for enabled python is already handled by PythonTest
    
    Change-Id: I23ada017f4294fbd34e9b245d012700021914881

diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 658e5d7..8cd37a1 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -60,11 +60,9 @@ endif
 
 endif # SYSTEM_PYTHON
 
-ifneq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_Module_add_check_targets,pyuno, \
     PythonTest_pyuno_pytests_ssl \
 ))
-endif
 
 ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS)))
 $(eval $(call gb_Module_add_targets,pyuno, \
commit 6980da37549d9ae0a89812aeccfa5365c9f7a9b9
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 18 14:49:13 2014 +0200

    move pyuno ssl test back to check targets
    
    Change-Id: Ib256217aa014693c73b233a4d8be4c0224287739

diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 98cc84a..658e5d7 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -61,11 +61,7 @@ endif
 endif # SYSTEM_PYTHON
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-# TODO: add dependencies to the PythonTest stuff to
-# depend on internal python getting installed
-# into instdir becore running python tests,
-# for now bodge this into a damn subsequentcheck
-$(eval $(call gb_Module_add_subsequentcheck_targets,pyuno, \
+$(eval $(call gb_Module_add_check_targets,pyuno, \
     PythonTest_pyuno_pytests_ssl \
 ))
 endif
commit e661730ed0b4145ec25486ddccd8b0a52ca261b3
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 18 14:45:18 2014 +0200

    PythonTest must depend on bundled python stuff
    
    Change-Id: I8957392a08bf7f39ef0cfac39484157c6a8f048d

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index f8c13d2..cd12661 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -29,7 +29,7 @@ ifneq ($(DISABLE_PYTHON),TRUE)
 # pass a hard-coded 139 to the gdb postprocess script to match soffice.bin
 # signal exit values (assumption: non-0 exit value here means it crashed)
 .PHONY : $(call gb_PythonTest_get_target,%)
-$(call gb_PythonTest_get_target,%) :
+$(call gb_PythonTest_get_target,%) : $(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_Output_announce,$*,$(true),PYT,2)
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -rf $(dir $(call gb_PythonTest_get_target,$*)) && \