From 81af84c04fa7ef8c8c12d2a9d3899a9a75cb8260 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sun, 15 Jul 2012 23:01:48 +0200 Subject: [PATCH] gbuild: let JunitTests run with MSVC: Apparently the long path name hack is no longer necessary; at least i did not experience any obvious problem with a source tree rooted in D:/lo/master. Change-Id: I2fd1893a827c27b5dcee438eae6572c596ae907c --- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 05d762834bd3..9519a482c423 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -633,10 +633,8 @@ gb_JunitTest_JunitTest_platform_longpathname_hack = endif # OOO_TEST_SOFFICE define gb_JunitTest_JunitTest_platform -$(call gb_JunitTest_JunitTest_platform_longpathname_hack,$(1)) - $(call gb_JunitTest_get_target,$(1)) : DEFS := \ - -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:`cat $(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 3/program/soffice.exe}" \ + -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice.exe}" \ -Dorg.openoffice.test.arg.env=PATH \ -Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1))