diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-07-28 12:29:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-23 19:30:00 +0000 |
| commit | 7f175ca8d0afb60204050467a7141368ca14d3a4 (patch) | |
| tree | c907c9593c459c5c4706a4233a6c65dee5d15c76 | |
| parent | f03975dc15719d32dd4476df3d6ea7cf64d5e145 (diff) | |
| parent | c33eece6c6053a2b20e580c8150e69e86826a8bc (diff) | |
| download | toolchain_jack-7f175ca8d0afb60204050467a7141368ca14d3a4.tar.gz toolchain_jack-7f175ca8d0afb60204050467a7141368ca14d3a4.tar.bz2 toolchain_jack-7f175ca8d0afb60204050467a7141368ca14d3a4.zip | |
Merge "Update Junit library used into jack-tests" into ub-jack
| -rw-r--r-- | build.xml | 4 | ||||
| -rw-r--r-- | jack-tests/.classpath | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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> |