summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-02-18 12:47:34 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-02-18 12:47:34 -0800
commite53165c4a3f1551624d477efd37fbb189fb750d5 (patch)
tree83699412ec7757a47d7592836ff0ea6ac12aeec7 /build.xml
parentbff86367607a713288a939639a654802349d1067 (diff)
downloadscala-e53165c4a3f1551624d477efd37fbb189fb750d5.tar.gz
scala-e53165c4a3f1551624d477efd37fbb189fb750d5.tar.bz2
scala-e53165c4a3f1551624d477efd37fbb189fb750d5.zip
Correct dependency for test.junit.comp
It needs a packed build. Skip the optimization of only compiling junit tests when those source change, since we should also rebuild when e.g., library source changes
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml12
1 files changed, 2 insertions, 10 deletions
diff --git a/build.xml b/build.xml
index f8e44c6f5c..5f6b04b8e4 100755
--- a/build.xml
+++ b/build.xml
@@ -1445,15 +1445,7 @@ TODO:
<stopwatch name="quick.sbt-interface.timer" action="total"/>
</target>
- <target name="test.junit.init" depends="quick.done">
- <uptodate property="test.junit.available" targetfile="${build-junit.dir}/test-compile.complete">
- <srcfiles dir="${test.junit.src}">
- <include name="**/*.scala"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="test.junit.comp" depends="test.junit.init, quick.done" unless="test.junit.available">
+ <target name="test.junit.comp" depends="pack.done">
<stopwatch name="test.junit.compiler.timer"/>
<mkdir dir="${test.junit.classes}"/>
<scalacfork
@@ -1469,7 +1461,7 @@ TODO:
<stopwatch name="test.junit.compiler.timer" action="total"/>
</target>
- <target name="test.junit" depends="test.junit.comp, test.junit.init">
+ <target name="test.junit" depends="test.junit.comp">
<stopwatch name="test.junit.timer"/>
<mkdir dir="${test.junit.classes}"/>
<echo message="Note: details of failed tests will be output to ${build-junit.dir}"/>