Author: hibou
Date: Fri Nov 19 14:14:12 2010
New Revision: 1036864
URL: http://svn.apache.org/viewvc?rev=1036864&view=rev
Log:
Fix some paths for the tests
Modified:
ant/ivy/core/trunk/build.xml
ant/ivy/core/trunk/test/test-ivy/acme-ivysettings.xml
ant/ivy/core/trunk/test/test-ivy/ivysettings.xml
Modified: ant/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=1036864&r1=1036863&r2=1036864&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Fri Nov 19 14:14:12 2010
@@ -430,6 +430,7 @@
<target name="prepare-test" depends="resolve" unless="skip.test">
<ant dir="${basedir}/test/test-repo" target="generate-bundles" />
<ant dir="${basedir}/test/test-bundles" target="build-all" />
+ <ant dir="${basedir}/test/test-bundles" target="ivy" />
</target>
<target name="test-internal" depends="build-test, init-tests"
unless="skip.test">
Modified: ant/ivy/core/trunk/test/test-ivy/acme-ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/test-ivy/acme-ivysettings.xml?rev=1036864&r1=1036863&r2=1036864&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/test-ivy/acme-ivysettings.xml (original)
+++ ant/ivy/core/trunk/test/test-ivy/acme-ivysettings.xml Fri Nov 19 14:14:12
2010
@@ -25,19 +25,19 @@
<osgi-parser />
</parsers>
<caches default="localcache">
- <cache name="localcache" basedir="target/test-data/cache">
+ <cache name="localcache"
basedir="${ivy.settings.dir}/../../build/test-data/cache">
<ttl duration="0d" />
</cache>
</caches>
<resolvers>
<chain name="default" returnFirst="true">
<osgi-file-resolver name="repo1">
- <ivy
pattern="java/test-bundles/dirs/[organisation].[module]-[revision]" />
- <artifact
pattern="java/test-bundles/dirs/[organisation].[module]-[revision]" />
+ <ivy
pattern="test/test-bundles/dirs/[organisation].[module]-[revision]" />
+ <artifact
pattern="test/test-bundles/dirs/[organisation].[module]-[revision]" />
</osgi-file-resolver>
<osgi-file-resolver name="repo2">
- <ivy
pattern="java/test-bundles/jars/[organisation].[module]-[revision].jar" />
- <artifact
pattern="java/test-bundles/jars/[organisation].[module]-[revision].jar" />
+ <ivy
pattern="test/test-bundles/jars/[organisation].[module]-[revision].jar" />
+ <artifact
pattern="test/test-bundles/jars/[organisation].[module]-[revision].jar" />
</osgi-file-resolver>
</chain>
</resolvers>
Modified: ant/ivy/core/trunk/test/test-ivy/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/test-ivy/ivysettings.xml?rev=1036864&r1=1036863&r2=1036864&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/test-ivy/ivysettings.xml (original)
+++ ant/ivy/core/trunk/test/test-ivy/ivysettings.xml Fri Nov 19 14:14:12 2010
@@ -24,14 +24,14 @@
<osgi-parser />
</parsers>
<caches default="localcache">
- <cache name="localcache" basedir="target/test-data/cache">
+ <cache name="localcache"
basedir="${ivy.settings.dir}/../../build/test-data/cache">
<ttl duration="0d" />
</cache>
</caches>
<resolvers>
<osgi-file-resolver name="osgi-rep">
- <ivy
pattern="java/test-ivy/osgi/eclipse/plugins/[organisation].[module]" />
- <ivy
pattern="java/test-ivy/osgi/eclipse/features/[organisation].[module]" />
+ <ivy
pattern="test/test-ivy/osgi/eclipse/plugins/[organisation].[module]" />
+ <ivy
pattern="test/test-ivy/osgi/eclipse/features/[organisation].[module]" />
</osgi-file-resolver>
</resolvers>
</ivysettings>
\ No newline at end of file
