[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - smoketest/CppunitTest_smoketest.mk

[David Tardon]

 smoketest/CppunitTest_smoketest.mk |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit f38c8417c8e095aebd5994c01a97169149c27522
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jul 12 12:50:49 2013 +0200

    allow to run smoketest in arbitrary installation
    
    Just set OOO_TEST_SOFFICE=path:/path/to/installation/program/soffice .
    
    Change-Id: Ic772a56328253f608a62a21923a74198fa29a136
    (cherry picked from commit e352abc2e60abd21e383ebf971e545ca510ac4ed)
    Signed-off-by: David Tardon <dtardon at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/4863
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index 0fad801..702c612 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -30,16 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
 	unotest \
 ))
 
-ifeq ($(OS),MACOSX)
-smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/MacOS/soffice
-else
-smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/program/soffice
-endif
-
 $(eval $(call gb_CppunitTest_use_ure,smoketest))
 
 $(eval $(call gb_CppunitTest_add_arguments,smoketest,\
-	-env:arg-soffice=$(smoketest_SOFFICE) \
+	-env:arg-soffice=$(gb_JunitTest_SOFFICEARG) \
 	-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
 	-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
 	-env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \