Make test_runner allow exclude_annotations along with test filters
commitc4667365e4c28b4007ad9671bec4c3429e6238c2
authormcdavid <mcdavid@amazon.com>
Tue, 21 Oct 2014 14:45:51 +0000 (21 07:45 -0700)
committerCommit bot <commit-bot@chromium.org>
Tue, 21 Oct 2014 14:46:38 +0000 (21 14:46 +0000)
tree130f97477eb18c9588e3de39db157f9c7e774fe5
parentc27727955e16786bb3de006ed7bdaf39c4b59e7e
Make test_runner allow exclude_annotations along with test filters

When running android instrumentation tests through test_runner, the
exclude_annotations rules will now take precedence over the test
filters, instead of being ignored.

BUG=425297

Review URL: https://codereview.chromium.org/668793002

Cr-Commit-Position: refs/heads/master@{#300486}
AUTHORS
build/android/pylib/instrumentation/test_jar.py