Revert "art/tools: add new tests for the build bot"
Unfortunately too many "localhost" netd failures.
This reverts commit 10ec4f937e351bc21c0eebada30c6df3f8570406.
Change-Id: Ibe28977e1e9f207f00a24f4c3167d08aa36cce5f
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 2089f85..344d2ded 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -22,9 +22,6 @@
# 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 @@
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,8 +65,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 $conscrypt_test_jar \
- --classpath $test_jar \
- ${working_packages[@]}
+vogar $@ --expectations art/tools/libcore_failures.txt --classpath $jsr166_test_jar --classpath $test_jar ${working_packages[@]}