You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2013/03/25 13:03:50 UTC
svn commit: r1460630 - in /lucene/dev/trunk/lucene: ./
core/src/test/org/apache/lucene/util/fst/ licenses/ test-framework/
Author: dweiss
Date: Mon Mar 25 12:03:49 2013
New Revision: 1460630
URL: http://svn.apache.org/r1460630
Log:
LUCENE-4879: Filter stack traces on console output.
Added:
lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.9.jar.sha1 (with props)
lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.9.jar.sha1 (with props)
Removed:
lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.8.jar.sha1
lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.8.jar.sha1
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/trunk/lucene/test-framework/ivy.xml
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1460630&r1=1460629&r2=1460630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Mar 25 12:03:49 2013
@@ -169,6 +169,12 @@ Documentation
to use the new SortedSetDocValues backed facet implementation.
(Shai Erera, Mike McCandless)
+Build
+
+* LUCENE-4879: Upgrade randomized testing to version 2.0.9:
+ Filter stack traces on console output. (Dawid Weiss, Robert Muir)
+
+
======================= Lucene 4.2.1 =======================
Bug Fixes
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1460630&r1=1460629&r2=1460630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Mon Mar 25 12:03:49 2013
@@ -106,6 +106,7 @@
<property name="tests.asserts.gracious" value="false"/>
<property name="tests.verbose" value="false"/>
<property name="tests.infostream" value="${tests.verbose}"/>
+ <property name="tests.filterstacks" value="true"/>
<condition property="tests.heapsize" value="768M">
<isset property="run.clover"/>
@@ -985,8 +986,25 @@
maxClassNameColumns="${tests.maxClassNameColumns}"
timestamps="${tests.timestamps}"
- showNumFailures="${tests.showNumFailures}"
- />
+ showNumFailures="${tests.showNumFailures}">
+
+ <!-- Filter stack traces. The default set of filters is similar to Ant's (reflection, assertions, junit's own stuff). -->
+ <junit4:filtertrace defaults="true" enabled="${tests.filterstacks}">
+ <!-- Lucene-specific stack frames (test rules mostly). -->
+ <containsstring contains="at com.carrotsearch.randomizedtesting.RandomizedRunner" />
+ <containsstring contains="at org.apache.lucene.util.AbstractBeforeAfterRule" />
+ <containsstring contains="at com.carrotsearch.randomizedtesting.rules." />
+ <containsstring contains="at org.apache.lucene.util.TestRule" />
+ <containsstring contains="at com.carrotsearch.randomizedtesting.rules.StatementAdapter" />
+ <containsstring contains="at com.carrotsearch.randomizedtesting.ThreadLeakControl" />
+
+ <!-- Add custom filters if you like. Lines that match these will be removed. -->
+ <!--
+ <containsstring contains=".." />
+ <containsregex pattern="^(\s+at )(org\.junit\.)" />
+ -->
+ </junit4:filtertrace>
+ </junit4:report-text>
<!-- Emits full status for all tests, their relative order on slaves. -->
<junit4:report-text
@@ -1183,6 +1201,9 @@ ant -Dtests.file.encoding=XXX ...
# the test passes.
ant -Dtests.leaveTemporary=true
+# Do *not* filter stack traces emitted to the console.
+ant -Dtests.filterstacks=false
+
# Output test files and reports.
${tests-output}/tests-report.txt - full ASCII tests report
${tests-output}/tests-failures.txt - failures only (if any)
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1460630&r1=1460629&r2=1460630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Mon Mar 25 12:03:49 2013
@@ -593,7 +593,7 @@ public class TestFSTs extends LuceneTest
// TODO: can FST be used to index all internal substrings,
// mapping to term?
- // java -cp ../build/codecs/classes/java:../test-framework/lib/randomizedtesting-runner-2.0.8.jar:../build/core/classes/test:../build/core/classes/test-framework:../build/core/classes/java:../build/test-framework/classes/java:../test-framework/lib/junit-4.10.jar org.apache.lucene.util.fst.TestFSTs /xold/tmp/allTerms3.txt out
+ // java -cp ../build/codecs/classes/java:../test-framework/lib/randomizedtesting-runner-2.0.9.jar:../build/core/classes/test:../build/core/classes/test-framework:../build/core/classes/java:../build/test-framework/classes/java:../test-framework/lib/junit-4.10.jar org.apache.lucene.util.fst.TestFSTs /xold/tmp/allTerms3.txt out
public static void main(String[] args) throws IOException {
int prune = 0;
int limit = Integer.MAX_VALUE;
Added: lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.9.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.9.jar.sha1?rev=1460630&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.9.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.9.jar.sha1 Mon Mar 25 12:03:49 2013
@@ -0,0 +1 @@
+bba707f4b0933f782dd456c262dc36f4bac01f45
Added: lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.9.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.9.jar.sha1?rev=1460630&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.9.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.9.jar.sha1 Mon Mar 25 12:03:49 2013
@@ -0,0 +1 @@
+4b8e918d278f56a18a6044660215290995889bfa
Modified: lucene/dev/trunk/lucene/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/ivy.xml?rev=1460630&r1=1460629&r2=1460630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/ivy.xml (original)
+++ lucene/dev/trunk/lucene/test-framework/ivy.xml Mon Mar 25 12:03:49 2013
@@ -32,8 +32,8 @@
<dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
<dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
- <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.8" transitive="false" conf="default->*;junit4-stdalone->*" />
- <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.8" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.9" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.9" transitive="false" conf="default->*;junit4-stdalone->*" />
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>