summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-01-29 09:59:54 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-01-29 09:59:54 +1000
commit1db62995b52b06f5037331172b3f54739d720d62 (patch)
tree0b684c4adfcb800fa195947b37fdb5dc89731552 /build.xml
parent8b5f2b435b4b14089806406c8923f7e845d10ef6 (diff)
parenteb15950e697eb77e52733f81c65e2d51951ad881 (diff)
downloadscala-1db62995b52b06f5037331172b3f54739d720d62.tar.gz
scala-1db62995b52b06f5037331172b3f54739d720d62.tar.bz2
scala-1db62995b52b06f5037331172b3f54739d720d62.zip
Merge commit 'eb15950' into merge/2.11.x-to-2.12.x-20150129
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index 69220169a9..4589d991d3 100755
--- a/build.xml
+++ b/build.xml
@@ -1437,7 +1437,7 @@ TODO:
<stopwatch name="test.junit.compiler.timer" action="total"/>
</target>
- <target name="test.junit" depends="test.junit.comp">
+ <target name="test.junit" depends="test.junit.comp, test.junit.init">
<stopwatch name="test.junit.timer"/>
<mkdir dir="${test.junit.classes}"/>
<echo message="Note: details of failed tests will be output to ${build-junit.dir}"/>