Author: damjan
Date: Fri Nov 10 01:31:17 2017
New Revision: 1814809
URL: http://svn.apache.org/viewvc?rev=1814809&view=rev
Log:
Use Hamcrest in dmake subsequent tests too.
Patch by: me
Modified:
openoffice/trunk/main/solenv/inc/javaunittest.mk
Modified: openoffice/trunk/main/solenv/inc/javaunittest.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/javaunittest.mk?rev=1814809&r1=1814808&r2=1814809&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/javaunittest.mk (original)
+++ openoffice/trunk/main/solenv/inc/javaunittest.mk Fri Nov 10 01:31:17 2017
@@ -50,6 +50,9 @@
JAVAFILES +:= $(JAVATESTFILES)
EXTRAJARFILES += $(OOO_JUNIT_JAR)
+.IF "$(HAMCREST_CORE_JAR)" != ""
+EXTRAJARFILES += $(HAMCREST_CORE_JAR)
+.END
.INCLUDE: settings.mk
@@ -73,11 +76,19 @@ ALLTAR : test
.END
.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
+.IF "$(HAMCREST_CORE_JAR)" != ""
+test .PHONY : $(JAVATARGET)
+ $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
+
'$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(HAMCREST_CORE_JAR)$(PATH_SEPARATOR)$(CLASSPATH)'
\
+ org.junit.runner.JUnitCore \
+ $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
+.ELSE
test .PHONY : $(JAVATARGET)
$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
'$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
org.junit.runner.JUnitCore \
$(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
+.END
.ELSE
test .PHONY :
echo 'test needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
