[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/ant

[Libreoffice Gerrit user]

 solenv/ant/aoo-ant.xml |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8adb8b907aaf44e790c395ff21624eddd5b590b4
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Thu Aug 23 06:01:40 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Thu Aug 23 06:01:40 2018 +0000

    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

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"/>