summaryrefslogtreecommitdiffstats
path: root/base/android/javatests
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-01 13:12:32 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-01 13:12:32 +0000
commit615ffbf01c03b8054ba4ad3e1c7bcb762af8da39 (patch)
treed8fc1031df9ee9299daf5c5ca84d4fbc5222f778 /base/android/javatests
parenteba03584f2fd055861efdf6bef5d10ea27ad8b11 (diff)
downloadchromium_src-615ffbf01c03b8054ba4ad3e1c7bcb762af8da39.zip
chromium_src-615ffbf01c03b8054ba4ad3e1c7bcb762af8da39.tar.gz
chromium_src-615ffbf01c03b8054ba4ad3e1c7bcb762af8da39.tar.bz2
Android: upstream @DisabledTest annotation for instrumentation tests.
This annotation is used to disable specific instrumentation tests. While at it, disable the failing testBaseStartup. BUG=139365,139870 TEST=Android FYI tester bot is green. Review URL: https://chromiumcodereview.appspot.com/10829104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android/javatests')
-rw-r--r--base/android/javatests/src/org/chromium/base/test/DisabledTest.java21
1 files changed, 21 insertions, 0 deletions
diff --git a/base/android/javatests/src/org/chromium/base/test/DisabledTest.java b/base/android/javatests/src/org/chromium/base/test/DisabledTest.java
new file mode 100644
index 0000000..2c8ad9a
--- /dev/null
+++ b/base/android/javatests/src/org/chromium/base/test/DisabledTest.java
@@ -0,0 +1,21 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.base.test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation is for disabled tests.
+ * <p>
+ * Tests with this annotation will not be run on any of the normal bots.
+ * Please note that they might eventually run on a special bot.
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DisabledTest {
+}