art/tools: add new tests in security packages to the build bot
Otherwise, it's difficult to know when they start to fail
Test packages added:
com.android.org.conscrypt
libcore.java.security
libcore.javax.net
Bug: 21722374
Change-Id: Ifc641d06a9a0e6ba23fbcb11f49025b8213351fe
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 62fd67b..5cc29d0 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -19,7 +19,7 @@
exit 1
fi
-common_targets="vogar vogar.jar core-tests apache-harmony-jdwp-tests-hostdex out/host/linux-x86/bin/adb jsr166-tests"
+common_targets="vogar vogar.jar core-tests apache-harmony-jdwp-tests-hostdex out/host/linux-x86/bin/adb jsr166-tests libjavacoretests conscrypt-tests"
android_root="/data/local/tmp/system"
linker="linker"
mode="target"
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt
index b053f0d..5d58c29 100644
--- a/tools/libcore_failures.txt
+++ b/tools/libcore_failures.txt
@@ -132,5 +132,42 @@
result: EXEC_FAILED,
names: ["libcore.javax.crypto.CipherTest#testCipher_ShortBlock_Failure",
"libcore.javax.crypto.CipherTest#testCipher_Success"]
+},
+{
+ description: "Tests newly added to the build bot (b/21722374)",
+ result: EXEC_FAILED,
+ names: ["com.android.org.conscrypt.NativeCryptoTest#test_SSL_do_handshake_clientCertificateRequested_throws_after_renegotiate",
+ "com.android.org.conscrypt.NativeCryptoTest#test_SSL_new",
+ "com.android.org.conscrypt.NativeCryptoTest#test_SSL_renegotiate",
+ "com.android.org.conscrypt.NativeCryptoTest#test_SSL_set_session_creation_enabled",
+ "libcore.java.security.KeyPairGeneratorTest#test_getInstance_provider1",
+ "libcore.java.security.KeyStoreTest",
+ "libcore.java.security.ProviderTest#test_Provider_getServices",
+ "libcore.java.security.SignatureTest#test18566_AlgorithmOid_MissingNull_Failure",
+ "libcore.java.security.SignatureTest#testVerify_NONEwithRSA_Key_SignatureTooLarge_Failure",
+ "libcore.java.security.SignatureTest#testVerify_SHA1withRSA_Key_WrongExpectedSignature_Failure",
+ "libcore.java.security.SignatureTest#test_getInstance",
+ "libcore.javax.net.ssl.KeyManagerFactoryTest#test_KeyManagerFactory_getDefaultAlgorithm",
+ "libcore.javax.net.ssl.KeyManagerFactoryTest#test_KeyManagerFactory_getInstance",
+ "libcore.javax.net.ssl.SSLContextTest#test_SSLContext_defaultConfiguration",
+ "libcore.javax.net.ssl.SSLSocketTest#test_SSLSocket_NoEnabledCipherSuites_Failure",
+ "libcore.javax.net.ssl.SSLSocketTest#test_SSLSocket_sendsTlsFallbackScsv_InappropriateFallback_Failure"]
+},
+{
+ description: "Tests newly added to the build bot (b/21722374). Not failing with adb sync; ./run-libcore-tests.sh",
+ result: EXEC_FAILED,
+ names: ["com.android.org.conscrypt.NativeCryptoTest#test_SSL_set_cipher_lists",
+ "libcore.java.security.KeyStoreTest#test_KeyStore_load_InputStream",
+ "libcore.java.security.KeyStoreTest#test_KeyStore_load_LoadStoreParameter",
+ "libcore.java.security.KeyStoreTest#test_KeyStore_size",
+ "libcore.java.security.MessageDigestTest#test_getInstance",
+ "libcore.java.security.cert.X509CertificateTest#test_Provider",
+ "libcore.javax.net.ssl.TrustManagerFactoryTest#test_TrustManagerFactory_getDefaultAlgorithm",
+ "libcore.javax.net.ssl.TrustManagerFactoryTest#test_TrustManagerFactory_getInstance"]
+},
+{
+ description: "Test failing because of wrong dates in build bot devices",
+ result: EXEC_FAILED,
+ names: ["libcore.java.security.cert.X509CertificateNistPkitsTest"]
}
]
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 4e76eb4..03016fa 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,14 +36,17 @@
fi
# Packages that currently work correctly with the expectation files.
-working_packages=("dalvik.system"
+working_packages=("com.android.org.conscrypt"
+ "dalvik.system"
"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"
@@ -66,4 +72,4 @@
# 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 $conscrypt_test_jar --classpath $jsr166_test_jar --classpath $test_jar ${working_packages[@]}
