diff options
Diffstat (limited to 'src/tests/antunit')
| -rw-r--r-- | src/tests/antunit/antunit-base.xml | 3 | ||||
| -rw-r--r-- | src/tests/antunit/taskdefs/condition/javaversion-test.xml | 40 | ||||
| -rw-r--r-- | src/tests/antunit/taskdefs/javac-test.xml | 9 |
3 files changed, 51 insertions, 1 deletions
diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml index 9863f3fcc..4bd4643d3 100644 --- a/src/tests/antunit/antunit-base.xml +++ b/src/tests/antunit/antunit-base.xml @@ -27,6 +27,9 @@ <property name="test3.jar" location="${antunit.tmpdir}/test3.jar"/> <property name="test4.jar" location="${antunit.tmpdir}/test4.jar"/> <property name="test5.jar" location="${antunit.tmpdir}/test5.jar"/> + <condition property="jdk10+"> + <javaversion atleast="10"/> + </condition> <available property="jdk9+" classname="java.lang.module.ModuleDescriptor"/> <available property="jdk1.8+" classname="java.lang.reflect.Executable"/> <available property="jdk1.7+" classname="java.nio.file.FileSystem"/> diff --git a/src/tests/antunit/taskdefs/condition/javaversion-test.xml b/src/tests/antunit/taskdefs/condition/javaversion-test.xml new file mode 100644 index 000000000..5f15a1e39 --- /dev/null +++ b/src/tests/antunit/taskdefs/condition/javaversion-test.xml @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project name="javaversion-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> + <import file="../../antunit-base.xml" /> + + <target name="test-atleast"> + <au:assertTrue message="Expected javaversion of ${ant.version} to be at least 1.7.0"> + <!-- Ant 1.9.x requires Java5 at runtime - so this must be true --> + <javaversion atleast="1.5" /> + </au:assertTrue> + </target> + + <target name="test-exactly"> + <au:assertTrue message="Expected javaversion of ${ant.java.version}"> + <javaversion exactly="${ant.java.version}" /> + </au:assertTrue> + </target> + + <target name="test-atleast-fail"> + <au:assertFalse> + <javaversion atleast="1000.0" /> + </au:assertFalse> + </target> + +</project> diff --git a/src/tests/antunit/taskdefs/javac-test.xml b/src/tests/antunit/taskdefs/javac-test.xml index 05c3269d2..48ed15daf 100644 --- a/src/tests/antunit/taskdefs/javac-test.xml +++ b/src/tests/antunit/taskdefs/javac-test.xml @@ -314,7 +314,14 @@ public class Adapter implements CompilerAdapter { <delete dir="${javac-dir}/classes"/> <mkdir dir="${javac-dir}/classes"/> </sequential> - </target> + + <sequential if:set="jdk10+"> + <echo>JDK 10+</echo> + <testJavac source="10" target="10"/> + <delete dir="${javac-dir}/classes"/> + <mkdir dir="${javac-dir}/classes"/> + </sequential> + </target> <target name="testJavacWithNativeHeaderGeneration" if="jdk1.8+" depends="setup"> <mkdir dir="${javac-dir}/src/org/example" /> |