art/tools: add new tests for the build bot
Otherwise, it's difficult to know when they start to fail
Bug: 21722374
Change-Id: I599e62ebafc28cf0dd60104c156f09ada8868bdc
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 344d2ded..2089f85 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -22,6 +22,9 @@
# Jar containing jsr166 tests.
jsr166_test_jar=out/target/common/obj/JAVA_LIBRARIES/jsr166-tests_intermediates/javalib.jar
+# Jar containing conscrypt tests.
+conscrypt_test_jar=out/target/common/obj/JAVA_LIBRARIES/conscrypt-tests_intermediates/javalib.jar
+
# Jar containing all the other tests.
test_jar=out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/javalib.jar
@@ -33,13 +36,16 @@
fi
# Packages that currently work correctly with the expectation files.
-working_packages=("libcore.icu"
+working_packages=("com.android.org.conscrypt"
+ "libcore.icu"
"libcore.io"
"libcore.java.lang"
"libcore.java.math"
+ "libcore.java.security"
"libcore.java.text"
"libcore.java.util"
"libcore.javax.crypto"
+ "libcore.javax.net"
"libcore.javax.security"
"libcore.javax.sql"
"libcore.javax.xml"
@@ -65,4 +71,8 @@
# 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 $jsr166_test_jar --classpath $test_jar ${working_packages[@]}
+vogar $@ --expectations art/tools/libcore_failures.txt \
+ --classpath $jsr166_test_jar \
+ --classpath $conscrypt_test_jar \
+ --classpath $test_jar \
+ ${working_packages[@]}