From c33eece6c6053a2b20e580c8150e69e86826a8bc Mon Sep 17 00:00:00 2001
From: mikaelpeltier <mikaelpeltier@google.com>
Date: Mon, 28 Jul 2014 10:45:24 +0200
Subject: Update Junit library used into jack-tests

- junit4.jar must be used instead of junit4-lib.jar, otherwise running a junit
from the jack-tests project will fail under eclipse since hamcrest classes do
not exist into junit4-lib.jar.

Change-Id: Ie91aa05d065d5074e07d2d51fc8478fde3716acb
---
 build.xml             | 4 ++--
 jack-tests/.classpath | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 4d980740..265b15f1 100644
--- a/build.xml
+++ b/build.xml
@@ -267,13 +267,13 @@
     <delete dir="${jack-tests.libs.dir}" />
   </target>
 
-  <target name="jack-tests" depends="core-stubs-mini,junit4-lib">
+  <target name="jack-tests" depends="core-stubs-mini,junit4">
     <!-- project layout -->
     <mkdir dir="${jack-tests.libs.dir}" />
     <!-- fetch dependencies -->
     <copy todir="${jack-tests.libs.dir}" flatten="true">
       <filelist dir="/" >
-        <file name="${junit4.dist.dir}/${junit4.libname}"/>
+        <file name="${junit4.dist.dir}/${junit4.execname}"/>
         <file name="${core-stubs-mini.dist.dir}/${core-stubs-mini.libname}"/>
       </filelist>
     </copy>
diff --git a/jack-tests/.classpath b/jack-tests/.classpath
index a0345ad0..639ea83b 100644
--- a/jack-tests/.classpath
+++ b/jack-tests/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry excluding="com/android/jack/classpath/test002/lib1override/|com/android/jack/enums/test003/link/Other.java|com/android/jack/enums/test003/link/Values.java|com/android/jack/error/test001/jack/A.java|com/android/jack/error/test002/jack/A.java|com/android/jack/nopackage/jack/|com/android/jack/java7/switches/|com/android/jack/java7/exceptions/|com/android/jack/java7/trywithresources/|com/android/jack/java7/parser/|com/android/jack/compiletime/" kind="src" path="tests"/>
-	<classpathentry kind="lib" path="libs/junit4-lib.jar"/>
+	<classpathentry kind="lib" path="libs/junit4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
-- 
cgit v1.2.3