diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 18:59:44 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 18:59:44 +0000 |
| commit | 168b4574bffac2fa0066269f193237dd01e81199 (patch) | |
| tree | 6e240854171d9af4f05d6a80fde396b39c0ad437 /user/ant/imageio_fix_test.patch | |
| parent | 20d2ef3f09eb5705f80d4f53865a69ce2314be5d (diff) | |
| parent | 398521c6a9d620107337f7ce07bf81f829a88c67 (diff) | |
| download | packages-168b4574bffac2fa0066269f193237dd01e81199.tar.gz packages-168b4574bffac2fa0066269f193237dd01e81199.tar.bz2 packages-168b4574bffac2fa0066269f193237dd01e81199.tar.xz packages-168b4574bffac2fa0066269f193237dd01e81199.zip | |
Merge branch 'master' into 'master'
New package: ant
This merge adds support for a new package: [Apache Ant](http://ant.apache.org/)!
Ant is a Java based utility. It does ant things, such as building, testing, and installing.
:)
See merge request !235
Diffstat (limited to 'user/ant/imageio_fix_test.patch')
| -rw-r--r-- | user/ant/imageio_fix_test.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/user/ant/imageio_fix_test.patch b/user/ant/imageio_fix_test.patch new file mode 100644 index 000000000..ad3cc3e67 --- /dev/null +++ b/user/ant/imageio_fix_test.patch @@ -0,0 +1,23 @@ +diff --git a/src/etc/testcases/taskdefs/optional/image/imageio.xml b/src/etc/testcases/taskdefs/optional/image/imageio.xml +index a7d6a23..0f0318b 100644 +--- a/src/etc/testcases/taskdefs/optional/image/imageio.xml ++++ b/src/etc/testcases/taskdefs/optional/image/imageio.xml +@@ -59,18 +59,6 @@ + </imageio> + </target> + +- <!-- this should produce a single file in the dest dir, overwriting any existing file --> +- <target name="testDrawOverwriteTrue" depends="setUp"> +- <imageio includes="*.jpg" srcdir="${src.dir}" destdir="${output}" +- overwrite="yes" failonerror="no"> +- <scale width="300" proportions="width"/> +- <draw xloc="10" yloc="10"> +- <rectangle height="50" width="50" strokewidth="2"/> +- <text string="Test"/> +- </draw> +- </imageio> +- </target> +- + <!-- this should not overwrite the existing file --> + <target name="testOverwriteFalse" depends="setUp"> + <imageio includes="*.jpg" srcdir="${src.dir}" destdir="${output}" |