diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 21:58:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 11:42:40 +0200 |
| commit | 8e602afd1e999e984e18d984a9986324831ac881 (patch) | |
| tree | c963379f4e317fa1f2b3d430adbb01da2088b252 /testtools | |
| parent | 7da7682965c0465a4c6ae017870daadc2b9ac099 (diff) | |
stop looking for Jar files in solver
Change-Id: I4d2a93fa7395354fbf2893df9e254ab39fa365af
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/CustomTarget_bridgetest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index d80e6096e6da..2c18eea801c0 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -39,7 +39,7 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_ $(if $(filter-out WNT,$(OS)),chmod +x $@) -testtools_MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar +testtools_MY_CLASSPATH := $(call gb_Jar_get_target,ridl)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,java_uno)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,jurt)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,juh) $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) @@ -48,7 +48,7 @@ $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testto "URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services))" \ "URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ "java" \ - "-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \ + "-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,testComponent)" \ "com.sun.star.comp.bridge.TestComponentMain" \ \""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \ "singleaccept" \ |