summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2013-10-14 07:16:34 -0700
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2013-10-14 07:16:34 -0700
commit686fb483e721ba2bef77e185afd5bf97a134d890 (patch)
tree75200d850cf9b39ec979e8eea71e1a2a6dbb7946 /build.xml
parentd068b163d36b3fbffe39f87e3dc152a14c3ca07e (diff)
parentb126e5c31b2bc57df5d0d5cf3508babe1dd7a759 (diff)
downloadscala-686fb483e721ba2bef77e185afd5bf97a134d890.tar.gz
scala-686fb483e721ba2bef77e185afd5bf97a134d890.tar.bz2
scala-686fb483e721ba2bef77e185afd5bf97a134d890.zip
Merge pull request #3037 from gkossakowski/fix-merge-3018v2.11.0-M6
[resubmit] Experimental Single Abstract Method support (sammy meets world)
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index ed9d02c4ce..cb159b6c9e 100755
--- a/build.xml
+++ b/build.xml
@@ -1625,7 +1625,7 @@ TODO:
</target>
<!-- See test/build-partest.xml for the macro(s) being used here. -->
- <target name="partest.task" depends="init,pack.done">
+ <target name="partest.task" depends="pack.done">
<!-- note the classpathref! this is the classpath used to run partest,
so it must have the new compiler.... -->
<taskdef
@@ -1633,7 +1633,7 @@ TODO:
resource="scala/tools/partest/antlib.xml"/>
</target>
- <target name="test.suite.init" depends="pack.done, partest.task">
+ <target name="test.suite.init" depends="partest.task">
<!-- read by test/partest to determine classpath used to run partest -->
<propertyfile file = "build/pack/partest.properties">
<entry key = "partest.classpath" value="${toString:partest.compilation.path}"/>