summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamjan Jovanovic <damjan@apache.org>2018-08-23 06:01:40 +0000
committerDamjan Jovanovic <damjan@apache.org>2018-08-23 06:01:40 +0000
commit8adb8b907aaf44e790c395ff21624eddd5b590b4 (patch)
tree334764f204ad988f840830ad6b77469c61e7a595
parenta2d01d342fc70dd943e0d30b4762e6e1830012ec (diff)
Beef up detection of JUnit and Hamcrest, to search all the system
directories they could be in, and search for all the names they commonly use. Check for versions of JUnit that require Hamcrest. Use Hamcrest in Ant JUnit tests when present. Patch by: me
Notes
Notes: ignore: obsolete
-rw-r--r--solenv/ant/aoo-ant.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 92ef437d624a..37ffb804e123 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -76,6 +76,7 @@
<path refid="test.classpath" if:set="has.test.classpath"/>
<pathelement location="${idl.classes.build.dir}"/>
<pathelement location="${OOO_JUNIT_JAR}"/>
+ <pathelement location="${HAMCREST_CORE_JAR}" if:set="HAMCREST_CORE_JAR"/>
</path>
<local name="has.idl.files"/>