[Libreoffice-commits] core.git: Branch 'feature/liblibo' - smoketest/Executable_libtest.mk smoketest/Module_smoketest.mk

[Michael Meeks]

 smoketest/Executable_libtest.mk |    9 ++++++++-
 smoketest/Module_smoketest.mk   |    2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit d60f358b0c1047c569559568bd6d2fdd0f301c98
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Mar 6 15:50:15 2013 +0000

    liblibo: install test library by itself and install it.
    
    Change-Id: Iaaa60a6e3afcc16c5b97f14c1d36d16ce4788739

diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk
index 75c534c..5dd6a5b 100644
--- a/smoketest/Executable_libtest.mk
+++ b/smoketest/Executable_libtest.mk
@@ -28,8 +28,15 @@ liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/Mac
 else
 liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/program
 endif
+liblibreoffice_OWN_LD_PATH_DIR := $(liblibreoffice_SOFFICE_INST)/libolib
+liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call gb_Library_get_linktargetname,libreoffice)
 
-run_libtest:
+$(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice)
+	mkdir -p $(liblibreoffice_OWN_LD_PATH_DIR)/Library
+	cp -a $(call gb_Library_get_target,libreoffice) $(liblibreoffice_OWN_LD_SO)
+
+run_libtest: $(liblibreoffice_OWN_LD_SO)
+	$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library)" \
 	$(call gb_LinkTarget_get_target,Executable/libtest) \
 		$(liblibreoffice_SOFFICE_INST) $(OUTDIR)/bin/smoketestdoc.sxw \
 
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index b82a037..31efcce 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -42,9 +42,11 @@ $(eval $(call gb_Module_add_targets,smoketest,\
 ))
 endif
 
+ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_check_targets,smoketest,\
 	Executable_libtest \
 ))
+endif
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
 	CppunitTest_smoketest \