diff options
| author | David Tardon <dtardon@redhat.com> | 2013-07-12 12:50:49 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-07-12 11:48:46 +0000 |
| commit | f38c8417c8e095aebd5994c01a97169149c27522 (patch) | |
| tree | d5a2f8762519f617a6b111837e06e31be17dd3b5 /smoketest | |
| parent | 6baa3e1d835e3dd84071038e1e190300300d3408 (diff) | |
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@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/4863
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/CppunitTest_smoketest.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 0fad8011de06..702c6128f18b 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 \ |