Merge "Enable jsr166 tests"

1 files changed, 10 insertions, 4 deletions

diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index a19fd15559..344d2dedb3 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -19,11 +19,16 @@ if [ ! -d libcore ]; then
   exit 1
 fi
 
-# Jar containing all the tests.
+# Jar containing jsr166 tests.
+jsr166_test_jar=out/target/common/obj/JAVA_LIBRARIES/jsr166-tests_intermediates/javalib.jar
+
+# Jar containing all the other tests.
 test_jar=out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/javalib.jar
 
+
 if [ ! -f $test_jar ]; then
-  echo "Before running, you must build core-tests and vogar: make core-tests vogar vogar.jar"
+  echo "Before running, you must build core-tests, jsr166-tests and vogar: \
+        make core-tests jsr166-tests vogar vogar.jar"
   exit 1
 fi
 
@@ -54,9 +59,10 @@ working_packages=("libcore.icu"
                   "org.apache.harmony.tests.java.util"
                   "org.apache.harmony.tests.java.text"
                   "org.apache.harmony.tests.javax.security"
-                  "tests.java.lang.String")
+                  "tests.java.lang.String"
+                  "jsr166")
 
 # Run the tests using vogar.
 echo "Running tests for the following test packages:"
 echo ${working_packages[@]} | tr " " "\n"
-vogar $@ --expectations art/tools/libcore_failures.txt --classpath $test_jar ${working_packages[@]}
+vogar $@ --expectations art/tools/libcore_failures.txt --classpath $jsr166_test_jar --classpath $test_jar ${working_packages[@]}