smoketest/CppunitTest_smoketest.mk | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit e352abc2e60abd21e383ebf971e545ca510ac4ed
Author: David Tardon <dtar...@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
diff --git a/smoketest/CppunitTest_smoketest.mk
b/smoketest/CppunitTest_smoketest.mk
index 3915df5..bd4becb 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=$(WORKDIR)/Zip/smoketestdoc.sxw \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
