summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-05-06 08:23:00 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-05-06 08:23:00 +0000
commit9cce14f56a59bbce52254ffc50ea6817fd94d8dd (patch)
treea3b3102c50ff045e38a0ecb4e6f5761356f7b12e
parent644fa22a432ad0f717878331e745d6c25cc57d5d (diff)
parent51a9098bf31411ceacae5aa13410df0f08fd17a1 (diff)
Merge "Re-enable JDWP tests on volantis."
-rwxr-xr-xtools/run-jdwp-tests.sh5
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index a007fa2171..1c25d94759 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -19,11 +19,6 @@ if [ ! -d libcore ]; then
exit 1
fi
-if [[ $ANDROID_SERIAL == HT4CTJT03670 ]] || [[ $ANDROID_SERIAL == HT49CJT00070 ]]; then
- echo "Not running on buildbot because of failures on volantis. Investigating."
- exit 0
-fi
-
# Jar containing all the tests.
test_jar=out/host/linux-x86/framework/apache-harmony-jdwp-tests-hostdex.jar
junit_jar=out/host/linux-x86/framework/junit.jar