X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fbuild.xml;h=79b7e56e839989a046e8c3ac31a9bdf5148425b4;hb=d0920ceb07da310eb8e10f6a11d5590bcb3184ea;hp=566ff8c6f926fa032a15e241fcc53c61bc486f9d;hpb=0e1b3e36eef8c2956d012196e2a49e088b6e150a;p=zxing.git

diff --git a/core/build.xml b/core/build.xml
index 566ff8c6..79b7e56e 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -79,7 +79,7 @@
       <!-- Needed for Mac OS. -->
       <!--<arg value="-libraryjars ${java.home}/../Classes/classes.jar"/>-->
       <!-- Needed for other Android apps besides Barcode Scanner. -->
-      <!--<arg value="-libraryjars ${android-home}/platforms/android-1.6/android.jar"/>-->
+      <!--<arg value="-libraryjars ${android-home}/platforms/android-3/android.jar"/>-->
       <arg value="-keep class com.google.zxing.* {public protected *;}"/>
       <arg value="-keep class com.google.zxing.common.*Binarizer {public protected *;}"/>
       <!-- Remove this line is you only use the Result base object and want the smallest jar. -->
@@ -111,7 +111,7 @@
       <classpath>
         <pathelement location="core.jar"/>
         <pathelement location="../javase/javase.jar"/>
-        <pathelement location="lib/junit.jar"/>
+        <pathelement location="lib/junit-4.8.2.jar"/>
       </classpath>
     </javac>
   </target>
@@ -143,11 +143,12 @@
         <pathelement location="core.jar"/>
         <pathelement location="build-test"/>
         <pathelement location="../javase/javase.jar"/>
-        <pathelement location="lib/junit.jar"/>
+        <pathelement location="lib/junit-4.8.2.jar"/>
       </classpath>
       <assertions>
         <enable/>
       </assertions>
+      <jvmarg value="-Djava.awt.headless=true"/>      
       <batchtest>
         <fileset dir="test/src">
           <include name="**/${subdir}/*BlackBox*TestCase.java"/>
@@ -164,12 +165,12 @@
         <pathelement location="core.jar"/>
         <pathelement location="build-test"/>
         <pathelement location="../javase/javase.jar"/>
-        <pathelement location="lib/junit.jar"/>
+        <pathelement location="lib/junit-4.8.2.jar"/>
       </classpath>
       <assertions>
         <enable/>
       </assertions>
-      <jvmarg value="-Xint"/> <!-- works around weird JIT bug in Java 6 -->
+      <jvmarg value="-Djava.awt.headless=true"/>
       <batchtest>
         <fileset dir="test/src">
           <include name="**/*TestCase.java"/>