Skip to content
This repository
Browse code

build.xml: made "ant test" work

  • Loading branch information...
commit bf8cb4b81d0b3d46ee693abf070f9e5bc37fce74 1 parent 4079311
Stéphane Épardaud FroMage authored

Showing 1 changed file with 23 additions and 5 deletions. Show diff stats Hide diff stats

  1. +23 5 build.xml
28 build.xml
@@ -25,6 +25,16 @@
25 25 <property name="ceylon.common.jar"
26 26 value="${ceylon.common.dir}/com.redhat.ceylon.common-${module.com.redhat.ceylon.common.version}.jar"/>
27 27 <property name="ceylon.common.lib" location="${ceylon.repo.dir}/${ceylon.common.jar}"/>
  28 + <property name="ceylon.typechecker.dir"
  29 + value="com/redhat/ceylon/typechecker/${module.com.redhat.ceylon.typechecker.version}"/>
  30 + <property name="ceylon.typechecker.jar"
  31 + value="${ceylon.typechecker.dir}/com.redhat.ceylon.typechecker-${module.com.redhat.ceylon.typechecker.version}.jar"/>
  32 + <property name="ceylon.typechecker.lib" location="${ceylon.repo.dir}/${ceylon.typechecker.jar}"/>
  33 + <property name="ceylon.compiler.java.dir"
  34 + value="com/redhat/ceylon/compiler/java/${module.com.redhat.ceylon.compiler.version}"/>
  35 + <property name="ceylon.compiler.java.jar"
  36 + value="${ceylon.compiler.java.dir}/com.redhat.ceylon.compiler.java-${module.com.redhat.ceylon.compiler.version}.jar"/>
  37 + <property name="ceylon.compiler.java.lib" location="${ceylon.repo.dir}/${ceylon.compiler.java.jar}"/>
28 38 <property name="ceylon.language.dir" value="ceylon/language/${module.ceylon.language.version}"/>
29 39 <property name="ceylon.language.car"
30 40 value="${ceylon.language.dir}/ceylon.language-${module.ceylon.language.version}.car"/>
@@ -90,6 +100,7 @@
90 100 <path id="test.run.classpath">
91 101 <path refid="test.build.classpath"/>
92 102 <pathelement path="${build.test}"/>
  103 + <pathelement path="${build.dist}"/>
93 104 <pathelement path="${shrinkwrap-impl-base.lib}"/>
94 105 <pathelement path="${shrinkwrap-spi.lib}"/>
95 106 </path>
@@ -127,13 +138,20 @@
127 138 <copy file="${jboss-modules.lib}"
128 139 tofile="${build.dist.repo}/${jboss-modules.dir}/main/${jboss-modules.module}"/>
129 140 <copy file="${jboss-jandex.lib}" tofile="${build.dist.repo}/${jboss-jandex.dir}/main/${jboss-jandex.module}"/>
130   -<!-- <copy file="${ceylon.common.lib}" tofile="${build.dist.repo}/${ceylon.common.jar}"/>
  141 + </target>
  142 +
  143 + <target name="dist-for-tests" description="Copy jars in the repo used by tests">
  144 + <copy file="${ceylon.common.lib}" tofile="${build.dist.repo}/${ceylon.common.jar}"/>
  145 + <copy file="${ceylon.typechecker.lib}" tofile="${build.dist.repo}/${ceylon.typechecker.jar}"/>
  146 + <copy file="${ceylon.compiler.java.lib}" tofile="${build.dist.repo}/${ceylon.compiler.java.jar}"/>
131 147 <copy file="${ceylon.language.lib}" tofile="${build.dist.repo}/${ceylon.language.car}"/>
132 148 <copy file="${ceylon.module-resolver.lib}" tofile="${build.dist.repo}/${ceylon.module-resolver.jar}"/>
133 149 <copy file="${ceylon.maven-support.lib}" tofile="${build.dist.repo}/${ceylon.maven-support.jar}"/>
134   --->
135   - </target>
136   -
  150 + <copy todir="${build.dist}">
  151 + <fileset dir="./testsuite/src/test/resources/"/>
  152 + </copy>
  153 + </target>
  154 +
137 155 <target name="publish" depends="dist,init.repo,publish-internal">
138 156 </target>
139 157
@@ -211,7 +229,7 @@
211 229 includeantruntime="false"/>
212 230 </target>
213 231
214   - <target name="test" depends="compile.tests" description="Runs the JUnit tests">
  232 + <target name="test" depends="compile.tests,dist-for-tests" description="Runs the JUnit tests">
215 233 <mkdir dir="${test.reports}"/>
216 234 <junit printsummary="yes" haltonfailure="no">
217 235 <classpath refid="test.run.classpath"/>

0 comments on commit bf8cb4b

Please sign in to comment.
Something went wrong with that request. Please try again.