Revert "art/tools: add new tests in security packages to the build bot"

This reverts commit 7904aba5f8ab73c12e83f8e786556c0c77306810.

Change-Id: I06d81bbe415999933cc73d8431a1ceb72bbdc132

3 files changed, 3 insertions, 39 deletions

diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index a026b03fdc..77e6b1ad14 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -19,7 +19,7 @@ if [ ! -d art ]; then
   exit 1
 fi
 
-common_targets="vogar vogar.jar core-tests apache-harmony-jdwp-tests-hostdex out/host/linux-x86/bin/adb jsr166-tests conscrypt-tests"
+common_targets="vogar vogar.jar core-tests apache-harmony-jdwp-tests-hostdex out/host/linux-x86/bin/adb jsr166-tests"
 android_root="/data/local/tmp/system"
 linker="linker"
 mode="target"
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt
index 35bce3bee1..b053f0d844 100644
--- a/tools/libcore_failures.txt
+++ b/tools/libcore_failures.txt
@@ -132,35 +132,5 @@
   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#test_KeyStore_Builder",
-          "libcore.java.security.KeyStoreTest#test_KeyStore_aliases",
-          "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_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: ["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.javax.net.ssl.TrustManagerFactoryTest#test_TrustManagerFactory_getDefaultAlgorithm",
-          "libcore.javax.net.ssl.TrustManagerFactoryTest#test_TrustManagerFactory_getInstance"]
 }
 ]
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index dde21e5e6c..344d2dedb3 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -22,9 +22,6 @@ fi
 # 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
 
@@ -36,16 +33,13 @@ if [ ! -f $test_jar ]; then
 fi
 
 # Packages that currently work correctly with the expectation files.
-working_packages=("com.android.org.conscrypt"
-                  "libcore.icu"
+working_packages=("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"
@@ -71,4 +65,4 @@ working_packages=("com.android.org.conscrypt"
 # 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 $conscrypt_test_jar --classpath $test_jar ${working_packages[@]}
+vogar $@ --expectations art/tools/libcore_failures.txt --classpath $jsr166_test_jar --classpath $test_jar ${working_packages[@]}