diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-29 15:27:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-29 15:27:40 +0200 |
| commit | 8b3b9d24197982993839af92ae9acb718c4fd513 (patch) | |
| tree | 5c0bf519165fe463343beef7899e28e5c11206f4 /solenv | |
| parent | 99e94cdd6566c8235a389463cd0113b388183ab8 (diff) | |
gb_JunitTest_JunitTest_platform_longpathname_hack is unused
...since 81af84c04fa7ef8c8c12d2a9d3899a9a75cb8260 "gbuild: let JunitTests run
with MSVC."
Change-Id: I4ba97431c3439c0bed74149fe66cbb76db5317ce
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 49b9bbfdc8b6..4d6b264dc6cc 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -447,35 +447,6 @@ endef gb_defaultlangiso := en-US gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip -ifeq ($(OOO_TEST_SOFFICE),) - - -# Work around Windows problems with long pathnames (see issue 50885) by -# installing into the temp directory instead of the module output tree (in which -# case $(target).instpath contains the path to the temp installation, -# which is removed after smoketest); can be removed once issue 50885 is fixed; -# on other platforms, a single installation to solver is created in -# smoketestoo_native. - -# for now, no dependency on $(shell ls $(gb_smoketest_instset)) -# because that doesn't work before the instset is built -# and there is not much of a benefit anyway (gbuild not knowing about smoketest) -define gb_JunitTest_JunitTest_platform_longpathname_hack -$(call gb_JunitTest_get_target,$(1)) : $(call gb_JunitTest_get_target,$(1)).instpath -$(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath) - -$(call gb_JunitTest_get_target,$(1)).instpath : - INST_DIR=$$$$(cygpath -m `mktemp -d -t testinst.XXXXXX`) \ - && unzip -d "$$$${INST_DIR}" $$(gb_smoketest_instset) \ - && mv "$$$${INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) "$$$${INST_DIR}"/opt\ - && mkdir -p $$(dir $$@) \ - && echo "$$$${INST_DIR}" > $$@ - -endef -else # OOO_TEST_SOFFICE -gb_JunitTest_JunitTest_platform_longpathname_hack = -endif # OOO_TEST_SOFFICE - define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(gb_DEVINSTALLROOT)/program/soffice.exe}" \ |