1 Internal patch to get Userland system-test working.

     2 Will not offer upstream.

     3 

     4 

     5 --- junit-r4.11/build.xml_orig	2015-07-21 14:04:27.085904567 -0700

     6 +++ junit-r4.11/build.xml	2015-07-22 16:03:07.512692190 -0700

     7 @@ -7,6 +7,7 @@

     8    <property name="src" value="src/main/java" />

     9    <property name="target" location="target" />

    10    <property name="bin" location="${target}/main" />

    11 +  <property name="system-binjar" location="/usr/share/lib/java/junit.jar" />

    12    <property name="version-base" value="4.11" />

    13    <property name="version-status" value="-SNAPSHOT" />

    14    <property name="version" value="${version-base}${version-status}" />

    15 @@ -195,9 +196,8 @@

    16        <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">

    17          <arg value="org.junit.tests.AllTests"/>

    18          <classpath>

    19 -          <pathelement location="${bin}" />

    20 +          <pathelement location="${system-binjar}" />

    21            <pathelement location="${testbin}" />

    22 -          <pathelement location="${hamcrestlib}" />

    23          </classpath>

    24        </java>    

    25      </sequential>

    26 @@ -210,7 +210,7 @@

    27      </run-dist-tests>

    28    </target>

    29  

    30 -  <target name="test" depends="build">

    31 +  <target name="test">

    32      <run-local-tests />

    33    </target>

    34