[Libreoffice-commits] core.git: 2 commits - pyuno/qa solenv/gbuild

[David Tardon]

 pyuno/qa/pytests/ssl.py     |    2 --
 solenv/gbuild/PythonTest.mk |    6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit d5556631e9acbd4af310e6300f4442ae9ab3b5da
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 18 22:04:17 2014 +0200

    this test apparently does not need pyuno
    
    Change-Id: I6000620bec95f32ec357a3e56e14f3255da978af

diff --git a/pyuno/qa/pytests/ssl.py b/pyuno/qa/pytests/ssl.py
index a67f532..f0a0a37 100644
--- a/pyuno/qa/pytests/ssl.py
+++ b/pyuno/qa/pytests/ssl.py
@@ -1,7 +1,5 @@
 import unittest
 
-from org.libreoffice.unotest import pyuno
-
 #I want to ensure that import ssl works on all platforms
 class SSLTest(unittest.TestCase):
     def test_ssl_import(self):
commit a72fb7f912fcf4e6ca5ef17406c6b08aac2c1f73
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 18 22:02:23 2014 +0200

    don't bother with _for_build here
    
    The tests cannot be run on cross-compilation anyway.
    
    Change-Id: I89afe30067e3f06fe090e529e6072c79ea696038

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 8c346a5..c0a1f2f 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -13,11 +13,11 @@ ifeq ($(SYSTEM_PYTHON),)
 gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
 gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
 ifeq ($(OS),MACOSX)
-gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target_for_build,python3)
+gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target,python3)
 else
-gb_PythonTest_DEPS := $(call gb_Package_get_target_for_build,python3)
+gb_PythonTest_DEPS := $(call gb_Package_get_target,python3)
 endif
-gb_PythonTest_DEPS += $(if $(filter-out WNT,$(OS)),$(call gb_Package_get_target_for_build,python_shell))
+gb_PythonTest_DEPS += $(if $(filter-out WNT,$(OS)),$(call gb_Package_get_target,python_shell))
 else
 gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD)
 gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD)