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 2014/06/29 12:47:54 UTC
svn commit: r1606448 - in /lucene/dev/branches/lucene5786/lucene: ./
test-framework/lib2/
Author: dweiss
Date: Sun Jun 29 10:47:53 2014
New Revision: 1606448
URL: http://svn.apache.org/r1606448
Log:
More debugging.
Added:
lucene/dev/branches/lucene5786/lucene/test-framework/lib2/
lucene/dev/branches/lucene5786/lucene/test-framework/lib2/ant-1.8.2.jar (with props)
lucene/dev/branches/lucene5786/lucene/test-framework/lib2/junit-4.10.jar (with props)
lucene/dev/branches/lucene5786/lucene/test-framework/lib2/junit4-ant-2.1.6-SNAPSHOT.jar (with props)
lucene/dev/branches/lucene5786/lucene/test-framework/lib2/randomizedtesting-runner-2.1.5.jar (with props)
Modified:
lucene/dev/branches/lucene5786/lucene/common-build.xml
Modified: lucene/dev/branches/lucene5786/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5786/lucene/common-build.xml?rev=1606448&r1=1606447&r2=1606448&view=diff
==============================================================================
--- lucene/dev/branches/lucene5786/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene5786/lucene/common-build.xml Sun Jun 29 10:47:53 2014
@@ -81,14 +81,20 @@
<property name="tests.cachefilehistory" value="10" />
<path id="junit-path">
- <fileset dir="${common.dir}/test-framework/lib">
+ <fileset dir="${common.dir}/test-framework/lib2">
<include name="junit-*.jar" />
<include name="randomizedtesting-runner-*.jar" />
</fileset>
</path>
+ <path id="path.junit4">
+ <fileset dir="${common.dir}/test-framework/lib2">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+
<path id="ant-path">
- <fileset dir="${common.dir}/test-framework/lib" includes="ant-*.jar"/>
+ <fileset dir="${common.dir}/test-framework/lib2" includes="ant-*.jar"/>
</path>
<!-- default arguments to pass to JVM executing tests -->
@@ -921,6 +927,7 @@
debugstream="true"
>
<!-- Classpaths. -->
+ <classpath refid="junit-path" />
<classpath refid="@{junit.classpath}"/>
<classpath refid="clover.classpath" />
@@ -1279,8 +1286,10 @@ ${tests-output}/junit4-*.suites - pe
<target name="install-junit4-taskdef" depends="ivy-configure">
<!-- JUnit4 taskdef. -->
+ <!--
<ivy:resolve file="${common.dir}/test-framework/ivy.xml" type="jar" log="quiet" />
<ivy:cachepath file="${common.dir}/test-framework/ivy.xml" conf="junit4-stdalone" type="jar" transitive="false" pathid="path.junit4" />
+ -->
<taskdef uri="antlib:com.carrotsearch.junit4">
<classpath refid="path.junit4" />
@@ -2226,9 +2235,9 @@ ${ant.project.name}.test.dependencies=${
<target name="-init-forbidden-apis" depends="-install-forbidden-apis">
<path id="forbidden-apis.allclasses.classpath">
+ <path refid="junit-path"/>
<path refid="classpath"/>
<path refid="test.classpath"/>
- <path refid="junit-path"/>
<!-- include the output directories, too (so we can still resolve excluded classes: -->
<pathelement path="${build.dir}/classes/java"/>
<pathelement path="${build.dir}/classes/test"/>
Added: lucene/dev/branches/lucene5786/lucene/test-framework/lib2/ant-1.8.2.jar
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5786/lucene/test-framework/lib2/ant-1.8.2.jar?rev=1606448&view=auto
==============================================================================
Binary file - no diff available.
Added: lucene/dev/branches/lucene5786/lucene/test-framework/lib2/junit-4.10.jar
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5786/lucene/test-framework/lib2/junit-4.10.jar?rev=1606448&view=auto
==============================================================================
Binary file - no diff available.
Added: lucene/dev/branches/lucene5786/lucene/test-framework/lib2/junit4-ant-2.1.6-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5786/lucene/test-framework/lib2/junit4-ant-2.1.6-SNAPSHOT.jar?rev=1606448&view=auto
==============================================================================
Binary file - no diff available.
Added: lucene/dev/branches/lucene5786/lucene/test-framework/lib2/randomizedtesting-runner-2.1.5.jar
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5786/lucene/test-framework/lib2/randomizedtesting-runner-2.1.5.jar?rev=1606448&view=auto
==============================================================================
Binary file - no diff available.