| Index: lucene/common-build.xml |
| =================================================================== |
| --- lucene/common-build.xml (revision 1587679) |
| +++ lucene/common-build.xml (working copy) |
| @@ -111,6 +111,7 @@ |
| <property name="tests.loggingfile" location="${common.dir}/tools/junit4/logging.properties"/> |
| <property name="tests.nightly" value="false" /> |
| <property name="tests.weekly" value="false" /> |
| + <property name="tests.monster" value="false" /> |
| <property name="tests.slow" value="true" /> |
| <property name="tests.cleanthreads.sysprop" value="perMethod"/> |
| <property name="tests.asserts.gracious" value="false"/> |
| @@ -819,6 +820,7 @@ |
| <attribute name="threadNum" default="1"/> |
| <attribute name="tests.nightly" default="${tests.nightly}"/> |
| <attribute name="tests.weekly" default="${tests.weekly}"/> |
| + <attribute name="tests.monster" default="${tests.monster}"/> |
| <attribute name="tests.slow" default="${tests.slow}"/> |
| <attribute name="tests.multiplier" default="${tests.multiplier}"/> |
| |
| @@ -950,6 +952,8 @@ |
| <sysproperty key="tests.nightly" value="@{tests.nightly}"/> |
| <!-- set whether or not weekly tests should run --> |
| <sysproperty key="tests.weekly" value="@{tests.weekly}"/> |
| + <!-- set whether or not monster tests should run --> |
| + <sysproperty key="tests.monster" value="@{tests.monster}"/> |
| <!-- set whether or not slow tests should run --> |
| <sysproperty key="tests.slow" value="@{tests.slow}"/> |
| |
| Index: lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java |
| =================================================================== |
| --- lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java (revision 1587679) |
| +++ lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java (working copy) |
| @@ -26,14 +26,14 @@ |
| import org.apache.lucene.store.MockDirectoryWrapper; |
| import org.apache.lucene.util.BytesRef; |
| import org.apache.lucene.util.LuceneTestCase; |
| +import org.apache.lucene.util.LuceneTestCase.Monster; |
| import org.apache.lucene.util.TestUtil; |
| import org.apache.lucene.util.TimeUnits; |
| -import org.junit.Ignore; |
| |
| import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; |
| |
| @TimeoutSuite(millis = 80 * TimeUnits.HOUR) |
| -@Ignore("takes ~ 45 minutes") |
| +@Monster("takes ~ 45 minutes") |
| public class Test2BBinaryDocValues extends LuceneTestCase { |
| |
| // indexes Integer.MAX_VALUE docs with a fixed binary field |
| Index: lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java |
| =================================================================== |
| --- lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java (revision 1587679) |
| +++ lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java (working copy) |
| @@ -25,12 +25,12 @@ |
| import org.apache.lucene.util.LuceneTestCase; |
| import org.apache.lucene.util.TestUtil; |
| import org.apache.lucene.util.TimeUnits; |
| -import org.junit.Ignore; |
| +import org.apache.lucene.util.LuceneTestCase.Monster; |
| |
| import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; |
| |
| @TimeoutSuite(millis = 80 * TimeUnits.HOUR) |
| -@Ignore("takes ~ 30 minutes") |
| +@Monster("takes ~ 30 minutes") |
| public class Test2BNumericDocValues extends LuceneTestCase { |
| |
| // indexes Integer.MAX_VALUE docs with an increasing dv field |
| Index: lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java |
| =================================================================== |
| --- lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java (revision 1587679) |
| +++ lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java (working copy) |
| @@ -31,6 +31,7 @@ |
| import org.apache.lucene.util.TestUtil; |
| import org.apache.lucene.util.TimeUnits; |
| import org.apache.lucene.util.TestUtil; |
| +import org.apache.lucene.util.LuceneTestCase.Monster; |
| import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; |
| import org.junit.Ignore; |
| |
| @@ -42,10 +43,9 @@ |
| */ |
| @SuppressCodecs({ "SimpleText", "Memory", "Direct" }) |
| @TimeoutSuite(millis = 4 * TimeUnits.HOUR) |
| +@Monster("uses lots of space and takes a few minutes") |
| public class Test2BPositions extends LuceneTestCase { |
| |
| - // uses lots of space and takes a few minutes |
| - @Ignore("Very slow. Enable manually by removing @Ignore.") |
| public void test() throws Exception { |
| BaseDirectoryWrapper dir = newFSDirectory(createTempDir("2BPositions")); |
| if (dir instanceof MockDirectoryWrapper) { |
| Index: lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java |
| =================================================================== |
| --- lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java (revision 1587679) |
| +++ lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java (working copy) |
| @@ -32,8 +32,8 @@ |
| import org.apache.lucene.util.LuceneTestCase; |
| import org.apache.lucene.util.TestUtil; |
| import org.apache.lucene.util.TimeUnits; |
| +import org.apache.lucene.util.LuceneTestCase.Monster; |
| import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; |
| -import org.junit.Ignore; |
| |
| import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; |
| |
| @@ -44,11 +44,9 @@ |
| */ |
| @SuppressCodecs({ "SimpleText", "Memory", "Direct" }) |
| @TimeoutSuite(millis = 4 * TimeUnits.HOUR) |
| +@Monster("takes ~20GB-30GB of space and 10 minutes, and more heap space sometimes") |
| public class Test2BPostingsBytes extends LuceneTestCase { |
| |
| - // @Absurd @Ignore takes ~20GB-30GB of space and 10 minutes. |
| - // with some codecs needs more heap space as well. |
| - @Ignore("Very slow. Enable manually by removing @Ignore.") |
| public void test() throws Exception { |
| BaseDirectoryWrapper dir = newFSDirectory(createTempDir("2BPostingsBytes1")); |
| if (dir instanceof MockDirectoryWrapper) { |
| Index: lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java |
| =================================================================== |
| --- lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java (revision 1587679) |
| +++ lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java (working copy) |
| @@ -28,12 +28,12 @@ |
| import org.apache.lucene.util.LuceneTestCase; |
| import org.apache.lucene.util.TestUtil; |
| import org.apache.lucene.util.TimeUnits; |
| -import org.junit.Ignore; |
| +import org.apache.lucene.util.LuceneTestCase.Monster; |
| |
| import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; |
| |
| @TimeoutSuite(millis = 80 * TimeUnits.HOUR) |
| -@Ignore("very slow") |
| +@Monster("very slow") |
| public class Test2BSortedDocValues extends LuceneTestCase { |
| |
| // indexes Integer.MAX_VALUE docs with a fixed binary field |
| Index: lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java |
| =================================================================== |
| --- lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java (revision 1587679) |
| +++ lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java (working copy) |
| @@ -18,6 +18,7 @@ |
| */ |
| |
| import org.apache.lucene.util.*; |
| +import org.apache.lucene.util.LuceneTestCase.Monster; |
| import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; |
| import org.apache.lucene.store.*; |
| import org.apache.lucene.search.*; |
| @@ -37,11 +38,12 @@ |
| // disk (but, should run successfully). Best to run w/ |
| // -Dtests.codec=<current codec>, and w/ plenty of RAM, eg: |
| // |
| -// ant test -Dtest.slow=true -Dtests.heapsize=8g |
| +// ant test -Dtest.monster=true -Dtests.heapsize=8g |
| // |
| // java -server -Xmx8g -d64 -cp .:lib/junit-4.10.jar:./build/classes/test:./build/classes/test-framework:./build/classes/java -Dlucene.version=4.0-dev -Dtests.directory=MMapDirectory -DtempDir=build -ea org.junit.runner.JUnitCore org.apache.lucene.index.Test2BTerms |
| // |
| @SuppressCodecs({ "SimpleText", "Memory", "Direct" }) |
| +@Monster("very slow, use 8g heap") |
| public class Test2BTerms extends LuceneTestCase { |
| |
| private final static int TOKEN_LEN = 10; |
| @@ -138,7 +140,6 @@ |
| } |
| } |
| |
| - @Ignore("Very slow. Enable manually by removing @Ignore.") |
| public void test2BTerms() throws IOException { |
| |
| System.out.println("Starting Test2B"); |
| Index: lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java |
| =================================================================== |
| --- lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java (revision 1587679) |
| +++ lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java (working copy) |
| @@ -24,9 +24,10 @@ |
| import org.apache.lucene.store.IndexInput; |
| import org.apache.lucene.store.IndexOutput; |
| import org.apache.lucene.store.MockDirectoryWrapper; |
| +import org.apache.lucene.util.LuceneTestCase.Monster; |
| import org.junit.Ignore; |
| |
| -@Ignore("You must increase heap to > 2 G to run this") |
| +@Monster("You must increase heap to > 2 G to run this") |
| public class Test2BPagedBytes extends LuceneTestCase { |
| |
| public void test() throws Exception { |
| Index: lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java |
| =================================================================== |
| --- lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (revision 1587679) |
| +++ lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (working copy) |
| @@ -236,6 +236,7 @@ |
| |
| public static final String SYSPROP_NIGHTLY = "tests.nightly"; |
| public static final String SYSPROP_WEEKLY = "tests.weekly"; |
| + public static final String SYSPROP_MONSTER = "tests.monster"; |
| public static final String SYSPROP_AWAITSFIX = "tests.awaitsfix"; |
| public static final String SYSPROP_SLOW = "tests.slow"; |
| public static final String SYSPROP_BADAPPLES = "tests.badapples"; |
| @@ -263,6 +264,17 @@ |
| @Retention(RetentionPolicy.RUNTIME) |
| @TestGroup(enabled = false, sysProperty = SYSPROP_WEEKLY) |
| public @interface Weekly {} |
| + |
| + /** |
| + * Annotation for monster tests that require special setup (e.g. use tons of disk and RAM) |
| + */ |
| + @Documented |
| + @Inherited |
| + @Retention(RetentionPolicy.RUNTIME) |
| + @TestGroup(enabled = false, sysProperty = SYSPROP_MONSTER) |
| + public @interface Monster { |
| + String value() default "monster test"; |
| + } |
| |
| /** |
| * Annotation for tests which exhibit a known issue and are temporarily disabled. |