git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277247 13f79535-47bb-0310-9956-ffa450edef68master
@@ -593,6 +593,13 @@ | |||||
<condition property="running.in.gump"> | <condition property="running.in.gump"> | ||||
<isset property="gump.merge"/> | <isset property="gump.merge"/> | ||||
</condition> | </condition> | ||||
<condition property="build.compiler" value="classic"> | |||||
<not> | |||||
<isset property="jdk1.3+"/> | |||||
</not> | |||||
</condition> | |||||
<property name="build.compiler" value="modern"/> | |||||
</target> | </target> | ||||
@@ -1473,6 +1480,7 @@ | |||||
<sysproperty key="tests-classpath.value" | <sysproperty key="tests-classpath.value" | ||||
value="${tests-classpath.value}"/> | value="${tests-classpath.value}"/> | ||||
<sysproperty key="root" file="${basedir}"/> | <sysproperty key="root" file="${basedir}"/> | ||||
<sysproperty key="build.compiler" value="${build.compiler}"/> | |||||
<formatter type="brief" usefile="false"/> | <formatter type="brief" usefile="false"/> | ||||
@@ -1633,6 +1641,7 @@ | |||||
<sysproperty key="tests-classpath.value" | <sysproperty key="tests-classpath.value" | ||||
value="${tests-classpath.value}"/> | value="${tests-classpath.value}"/> | ||||
<sysproperty key="root" file="${basedir}"/> | <sysproperty key="root" file="${basedir}"/> | ||||
<sysproperty key="build.compiler" value="${build.compiler}"/> | |||||
<classpath refid="tests-classpath"/> | <classpath refid="tests-classpath"/> | ||||
<formatter type="plain" usefile="false"/> | <formatter type="plain" usefile="false"/> | ||||
<test name="${testcase}"/> | <test name="${testcase}"/> | ||||
@@ -144,13 +144,18 @@ public class JavacTest extends TestCase { | |||||
// check defaults | // check defaults | ||||
String compiler = javac.getCompiler(); | String compiler = javac.getCompiler(); | ||||
assertNotNull(compiler); | assertNotNull(compiler); | ||||
assertTrue("default value", | |||||
"javac1.1".equals(compiler) | |||||
|| "javac1.2".equals(compiler) | |||||
|| "javac1.3".equals(compiler) | |||||
|| "javac1.4".equals(compiler) | |||||
|| "javac1.5".equals(compiler) | |||||
|| "classic".equals(compiler)); | |||||
if (System.getProperty("build.compiler") != null) { | |||||
assertEquals(System.getProperty("build.compiler"), | |||||
compiler); | |||||
} else { | |||||
assertTrue("default value", | |||||
"javac1.1".equals(compiler) | |||||
|| "javac1.2".equals(compiler) | |||||
|| "javac1.3".equals(compiler) | |||||
|| "javac1.4".equals(compiler) | |||||
|| "javac1.5".equals(compiler) | |||||
|| "classic".equals(compiler)); | |||||
} | |||||
javac.setFork(true); | javac.setFork(true); | ||||
assertNotNull(javac.getCompiler()); | assertNotNull(javac.getCompiler()); | ||||
@@ -160,7 +165,8 @@ public class JavacTest extends TestCase { | |||||
// check build.compiler provides defaults | // check build.compiler provides defaults | ||||
javac = new Javac(); | javac = new Javac(); | ||||
javac.setProject(project); | javac.setProject(project); | ||||
project.setNewProperty("build.compiler", "jikes"); | |||||
// setUserProperty to override system properties | |||||
project.setUserProperty("build.compiler", "jikes"); | |||||
compiler = javac.getCompiler(); | compiler = javac.getCompiler(); | ||||
assertNotNull(compiler); | assertNotNull(compiler); | ||||
assertEquals("jikes", compiler); | assertEquals("jikes", compiler); | ||||