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

[Bjoern Michaelsen]

 solenv/gbuild/PythonTest.mk                       |    2 +-
 solenv/gbuild/platform/macosx.mk                  |    1 +
 solenv/gbuild/platform/unittest-failed-default.sh |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit a37364a017e74b93b89378b63268eae05aa7552f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Nov 20 20:01:11 2015 +0100

    wrap to allow for tests with longer names without inconvenient linebreaks
    
    Change-Id: I9d1ae01d29ff08ce9de34d86088c1bbbe53bd159

diff --git a/solenv/gbuild/platform/unittest-failed-default.sh b/solenv/gbuild/platform/unittest-failed-default.sh
index 24718fd9..5e6b40f 100755
--- a/solenv/gbuild/platform/unittest-failed-default.sh
+++ b/solenv/gbuild/platform/unittest-failed-default.sh
@@ -19,9 +19,12 @@
 cat << EOF
 
 Error: a unit test failed, please do one of:
-make $1Test_$2 CPPUNITTRACE="gdb --args"    # for interactive debugging on Linux
-make $1Test_$2 VALGRIND=memcheck            # for memory checking
-make $1Test_$2 DEBUGCPPUNIT=TRUE            # for exception catching
+make $1Test_$2 CPPUNITTRACE="gdb --args"
+    # for interactive debugging on Linux
+make $1Test_$2 VALGRIND=memcheck
+    # for memory checking
+make $1Test_$2 DEBUGCPPUNIT=TRUE
+    # for exception catching
 
 EOF
 
commit baec6a144863e9a2ea892dcdf4026fe4f946c8bd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Nov 20 19:50:59 2015 +0100

    Revert "Fix dependency for Mac"
    
    This reverts commit de37e7ae4808dc9cdd84a8c21411958ed51db56.
    This should now be properly fixed with a2185987.
    
    nitpick: That commit was refering to a wrong commit anyway, it should
    have refered to a2185987d instead.
    
    Change-Id: Ic46db94568ac4074f471f42678cdf8d9fb32ef67

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index a65a4a3..eeff6a0 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -14,7 +14,7 @@ gb_PythonTest_UNITTESTFAILED ?= $(GBUILDDIR)/platform/unittest-failed-default.sh
 ifeq ($(SYSTEM_PYTHON),)
 gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
 gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
-gb_PythonTest_DEPS ?= $(if $(filter MACOSX,$(OS)),$(call gb_GeneratedPackage_get_target,python3),$(call gb_Package_get_target,python3)) $(call gb_Package_get_target,python_shell)
+gb_PythonTest_DEPS ?= $(call gb_Package_get_target,python3) $(call gb_Package_get_target,python_shell)
 else
 gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD)
 gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD)
commit 95f22f8a691e6ab30c502947e7513976110366ff
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Nov 20 19:53:45 2015 +0100

    set gb_PythonTest_DEPS in .../platform/macosx.mk for real
    
    Change-Id: Icc7f6f063e6a31d3d84e9757dc45859f6fe1703c

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index c428527..be5cd16 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -302,6 +302,7 @@ endef
 # PythonTest class
 
 gb_PythonTest_UNITTESTFAILED := $(GBUILDDIR)/platform/unittest-failed-MACOSX.mk
+gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target,python3) $(call gb_Package_get_target,python_shell)
 gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)
 ifneq ($(LIBO_LIB_FOLDER),$(LIBO_URE_LIB_FOLDER))
 gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(INSTROOT)/$(LIBO_LIB_FOLDER)