diff options
| author | Jaikiran Pai <jaikiran@apache.org> | 2019-08-26 10:27:20 +0530 |
|---|---|---|
| committer | Jaikiran Pai <jaikiran@apache.org> | 2019-08-26 10:27:20 +0530 |
| commit | 3a1ff0d804eca83d3ecdab35a47deac5f3cf9f9d (patch) | |
| tree | 7880bc5476db1cdbb0b5feb9da5328c2052d5e71 /src/etc | |
| parent | 127b08d5e5dbaacccb9d42e5b7f0e7127c7ea472 (diff) | |
| download | ant-3a1ff0d804eca83d3ecdab35a47deac5f3cf9f9d.tar.gz | |
Skip ImageTest if JPEG codec from com/sun/image/codec isn't available in the Java runtime.
OpenJDK even in Java 8 (update 222) doesn't include these codecs. Oracle JDK has it in
Java 8, but not in subsequent Java releases.
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/testcases/taskdefs/optional/image/image.xml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/etc/testcases/taskdefs/optional/image/image.xml b/src/etc/testcases/taskdefs/optional/image/image.xml index 906ca9eab..d94a69dc2 100644 --- a/src/etc/testcases/taskdefs/optional/image/image.xml +++ b/src/etc/testcases/taskdefs/optional/image/image.xml @@ -23,47 +23,48 @@ <target name="setUp"> <mkdir dir="${output}"/> <property name="src.dir" location="${basedir}/src"/> + <available classname="com.sun.image.codec.jpeg.JPEGCodec" property="jpeg.codec.available"/> </target> <target name="main" depends="testSimpleScale"> </target> <!-- this should produce a single file in the dest dir --> - <target name="testSimpleScale" depends="setUp"> + <target name="testSimpleScale" depends="setUp" if="jpeg.codec.available"> <image includes="*.jpg" srcdir="${src.dir}" destdir="${output}" overwrite="no" failonerror="no"> <scale width="300" proportions="width"/> </image> </target> <!-- this should put some text in the log --> - <target name="testEchoToLog" depends="setUp"> + <target name="testEchoToLog" depends="setUp" if="jpeg.codec.available"> <image includes="*.jpg" srcdir="${src.dir}" destdir="${output}" overwrite="no" failonerror="no"> <scale width="300" proportions="width"/> </image> </target> <!-- this should produce a single file in the dest dir --> - <target name="testFailOnError" depends="setUp"> + <target name="testFailOnError" depends="setUp" if="jpeg.codec.available"> <image includes="*.jpg" srcdir="${src.dir}" destdir="${output}" overwrite="no" failonerror="yes"> <scale width="300" proportions="width"/> </image> </target> <!-- this should produce a single file in the dest dir, overwriting any existing file --> - <target name="testOverwriteTrue" depends="setUp"> + <target name="testOverwriteTrue" depends="setUp" if="jpeg.codec.available"> <image includes="*.jpg" srcdir="${src.dir}" destdir="${output}" overwrite="true" failonerror="no"> <scale width="300" proportions="width"/> </image> </target> <!-- this should not overwrite the existing file --> - <target name="testOverwriteFalse" depends="setUp"> + <target name="testOverwriteFalse" depends="setUp" if="jpeg.codec.available"> <image includes="*.jpg" srcdir="${src.dir}" destdir="${output}" overwrite="false" failonerror="no"> <scale width="300" proportions="width"/> </image> </target> - <target name="testSimpleScaleWithMapper" depends="setUp"> + <target name="testSimpleScaleWithMapper" depends="setUp" if="jpeg.codec.available"> <image includes="*.jpg" srcdir="${src.dir}" destdir="${output}" overwrite="no" failonerror="no"> <scale width="300" proportions="width"/> |