Skip to content
Snippets Groups Projects
Commit fe797ab2 authored by Mirco Dotta's avatar Mirco Dotta
Browse files

Updated classpath of the "run-test" task.

parent d472cefe
Branches
Tags
No related merge requests found
...@@ -51,15 +51,21 @@ ...@@ -51,15 +51,21 @@
<!-- generic classpath settings (collecting all) --> <!-- generic classpath settings (collecting all) -->
<path id="lib.path"> <path id="lib.path">
<pathelement location="${lib.dir}/ScalaCheck-1.5.jar"/>
<pathelement location="${lib.dir}/scalatest-0.9.5.jar" />
<pathelement location="${lib.dir}/specs-1.5.0.jar" />
<!-- why the jars are not taken automatically from the lib .. ???
<fileset dir="."> <fileset dir=".">
<include name="${lib.dir}/*.jar"/> <include name="${lib.dir}/*.jar"/>
</fileset> </fileset>
<fileset dir="."> <fileset dir=".">
<include name="${lib.dir}/*.zip"/> <include name="${lib.dir}/*.zip"/>
</fileset> </fileset-->
</path> </path>
<target name="compile" description="compile the FunCheck plugin">
<target name="compile" description="compile the FunCheck plugin">
<mkdir dir="${build.dir}" /> <mkdir dir="${build.dir}" />
<scalac srcdir="${sources.dir}" destdir="${build.dir}" force="changed" addparams="${scalac.default.params}"> <scalac srcdir="${sources.dir}" destdir="${build.dir}" force="changed" addparams="${scalac.default.params}">
<classpath refid="build.path" /> <classpath refid="build.path" />
...@@ -95,8 +101,6 @@ ...@@ -95,8 +101,6 @@
<path refid="scalac.class.path" /> <path refid="scalac.class.path" />
<path refid="lib.path" /> <path refid="lib.path" />
<path refid="build.path" /> <path refid="build.path" />
<pathelement location="${lib.dir}/ScalaCheck-1.5.jar" />
<pathelement location="${lib.dir}/scalatest-0.9.5.jar" />
<pathelement location="${build.examples.dir}"/> <pathelement location="${build.examples.dir}"/>
</classpath> </classpath>
</scalac> </scalac>
...@@ -109,16 +113,14 @@ ...@@ -109,16 +113,14 @@
addproperty="test.name" addproperty="test.name"
/> />
<echo message="--- running tests ${tests.name}."/> <echo message="--- running test ${test.name}."/>
<java classname="scala.tools.nsc.MainGenericRunner" fork="true"> <java classname="scala.tools.nsc.MainGenericRunner" fork="true">
<classpath> <classpath>
<path refid="scalac.class.path" /> <path refid="scalac.class.path" />
<path refid="lib.path" /> <path refid="lib.path" />
<pathelement location="${lib.dir}/ScalaCheck-1.5.jar"/> <path refid="build.path" />
<pathelement location="${lib.dir}/scalatest-0.9.5.jar" />
<pathelement location="${build.examples.dir}"/> <pathelement location="${build.examples.dir}"/>
<pathelement location="${build.tests.dir}"/> <pathelement location="${build.tests.dir}"/>
<path refid="build.path" />
</classpath> </classpath>
<arg line="${test.name}" /> <arg line="${test.name}" />
</java> </java>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment