Author: damjan
Date: Fri Nov 10 01:18:59 2017
New Revision: 1814808
URL: http://svn.apache.org/viewvc?rev=1814808&view=rev
Log:
Only specify Hamcrest in the classpath during subsequent tests
if it's been specified.
Patch by: me
Modified:
openoffice/trunk/main/solenv/gbuild/JunitTest.mk
Modified: openoffice/trunk/main/solenv/gbuild/JunitTest.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/JunitTest.mk?rev=1814808&r1=1814807&r2=1814808&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/JunitTest.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/JunitTest.mk Fri Nov 10 01:18:59 2017
@@ -46,7 +46,11 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD)
define gb_JunitTest_JunitTest
+ifeq ($(HAMCREST_CORE_JAR),)
+$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value
XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call
gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
+else
$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value
XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call
gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(HAMCREST_CORE_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
+endif
$(call gb_JunitTest_get_target,$(1)) : CLASSES :=
$(call gb_JunitTest_JunitTest_platform,$(1))
