Don't walk the libcore tree when finding tests.

vogar will run tests twice if it is given, for example,
libcore.java.lang and libcore.java.lang.ref.

Also currently disable math tests until expectations/fixes
are in.

Change-Id: Iba2edad3ce0a6b27947ce6897d70abedf8d1e6b3

1 files changed, 10 insertions, 15 deletions

diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 0e52444f81..5c7e3c5664 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -28,20 +28,15 @@ if [ ! -f $test_jar ]; then
 fi
 
 # Packages that currently report no failures.
-working_packages=("java/lang"
-                  "java/math"
-                  "java/util")
-
-# Create a regexp suitable for egrep.
-working_packages=$(printf "|%s" "${working_packages[@]}")
-working_packages=${working_packages:1}
-
-# Get all the tests for these packages.
-test_packages=$(find libcore/*/src/test -name "*.java" | \
-  egrep -E $working_packages | \
-  xargs grep -h '^package ' | sed 's/^package //' | sed 's/;$//' | sort | uniq | tr "\n" " ")
+working_packages=("libcore.java.lang"
+                  "libcore.java.util"
+                  "org.apache.harmony.annotation"
+                  "org.apache.harmony.regex"
+                  "org.apache.harmony.tests.java.lang"
+                  "org.apache.harmony.tests.java.util"
+                  "tests.java.lang.String")
 
 # Run the tests using vogar.
-echo "Running tests for following test packages:"
-echo $test_packages | tr " " "\n"
-vogar $@ --classpath $test_jar $test_packages
+echo "Running tests for the following test packages:"
+echo ${working_packages[@]} | tr " " "\n"
+vogar $@ --classpath $test_jar ${working_packages[@]}