diff --git a/Magick++/tests/Makefile.am b/Magick++/tests/Makefile.am
index 56f7e8a..8204840 100644
--- a/Magick++/tests/Makefile.am
+++ b/Magick++/tests/Makefile.am
@@ -55,17 +55,7 @@
# Tests to run
TESTS = \
- test_exceptions.sh \
- test_appendImages.sh \
- test_attributes.sh \
- test_averageImages.sh \
- test_coalesceImages.sh \
- test_colorHistogram.sh \
- test_color.sh \
- test_montageImages.sh \
- test_morphImages.sh \
- test_readWriteBlob.sh \
- test_readWriteImages.sh
+ tests.tap \
# Tests which are expected to fail
XFAIL_TESTS =
diff --git a/Magick++/tests/appendImages.sh b/Magick++/tests/appendImages.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/appendImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/attributes.sh b/Magick++/tests/attributes.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/attributes.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/averageImages.sh b/Magick++/tests/averageImages.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/averageImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/coalesceImages.sh b/Magick++/tests/coalesceImages.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/coalesceImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/coderInfo.sh b/Magick++/tests/coderInfo.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/coderInfo.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/color.sh b/Magick++/tests/color.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/color.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/colorHistogram.sh b/Magick++/tests/colorHistogram.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/colorHistogram.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/exceptions.sh b/Magick++/tests/exceptions.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/exceptions.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/montageImages.sh b/Magick++/tests/montageImages.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/montageImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/morphImages.sh b/Magick++/tests/morphImages.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/morphImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/readWriteBlob.sh b/Magick++/tests/readWriteBlob.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/readWriteBlob.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/readWriteImages.sh b/Magick++/tests/readWriteImages.sh
deleted file mode 100755
index 0d242a9..0000000
--- a/Magick++/tests/readWriteImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick. Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_appendImages.sh b/Magick++/tests/test_appendImages.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_appendImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_attributes.sh b/Magick++/tests/test_attributes.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_attributes.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_averageImages.sh b/Magick++/tests/test_averageImages.sh
deleted file mode 100755
index 0ecce2f..0000000
--- a/Magick++/tests/test_averageImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_coalesceImages.sh b/Magick++/tests/test_coalesceImages.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_coalesceImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_coderInfo.sh b/Magick++/tests/test_coderInfo.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_coderInfo.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_color.sh b/Magick++/tests/test_color.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_color.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_colorHistogram.sh b/Magick++/tests/test_colorHistogram.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_colorHistogram.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_exceptions.sh b/Magick++/tests/test_exceptions.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_exceptions.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_montageImages.sh b/Magick++/tests/test_montageImages.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_montageImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_morphImages.sh b/Magick++/tests/test_morphImages.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_morphImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_readWriteBlob.sh b/Magick++/tests/test_readWriteBlob.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_readWriteBlob.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/Magick++/tests/test_readWriteImages.sh b/Magick++/tests/test_readWriteImages.sh
deleted file mode 100755
index 478b955..0000000
--- a/Magick++/tests/test_readWriteImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
- cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 8c1f8ab..3c7a8a2 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision "9013:9029M"
+#define MagickSVNRevision "9013:9032M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 7,0,0
#define MagickLibAddendum "-0"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
-#define MagickReleaseDate "2012-08-20"
+#define MagickReleaseDate "2012-08-21"
#define MagickChangeDate "20120808"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index a481116..cfe6212 100644
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -140,7 +140,7 @@
MagickWand/MagickWand-config.1 \
MagickWand/MagickWand.pc.in \
MagickWand/sequence.miff \
- MagickWand/common.sh \
+ MagickWand/common.shi \
$(MAGICKWAND_TESTS)
MagickWand_drawtest_SOURCES = MagickWand/drawtest.c
@@ -156,8 +156,8 @@
MagickWand/wandtest
MAGICKWAND_TESTS = \
- MagickWand/drawtest.sh \
- MagickWand/wandtest.sh
+ MagickWand/drawtest.tap \
+ MagickWand/wandtest.tap
MAGICKWAND_CLEANFILES = \
MagickWand/*_out.*
diff --git a/MagickWand/common.sh b/MagickWand/common.shi
similarity index 100%
rename from MagickWand/common.sh
rename to MagickWand/common.shi
diff --git a/MagickWand/drawtest.sh b/MagickWand/drawtest.sh
deleted file mode 100755
index 3629d33..0000000
--- a/MagickWand/drawtest.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1999-2012 ImageMagick Studio LLC
-#
-# This program is covered by multiple licenses, which are described in
-# LICENSE. You should have received a copy of LICENSE with this
-# package; otherwise see http://www.imagemagick.org/script/license.php.
-#
-
-set -e # Exit on any error
-. ${srcdir}/MagickWand/common.sh
-
-${MEMCHECK} ./drawtest drawtest_out.miff
diff --git a/MagickWand/wandtest.sh b/MagickWand/drawtest.tap
similarity index 71%
copy from MagickWand/wandtest.sh
copy to MagickWand/drawtest.tap
index f1dbc5f..486acf4 100755
--- a/MagickWand/wandtest.sh
+++ b/MagickWand/drawtest.tap
@@ -5,10 +5,10 @@
# LICENSE. You should have received a copy of LICENSE with this
# package; otherwise see http://www.imagemagick.org/script/license.php.
#
-# Test for '${CONVERT}' utility.
-#
set -e # Exit on any error
-. ${srcdir}/MagickWand/common.sh
+. ${srcdir}/MagickWand/common.shi
+echo "1..1"
-${MEMCHECK} ./wandtest wandtest_out.miff
+${MEMCHECK} ./drawtest drawtest_out.miff && echo "ok" || echo "not ok"
+:
diff --git a/MagickWand/wandtest.sh b/MagickWand/wandtest.tap
similarity index 77%
rename from MagickWand/wandtest.sh
rename to MagickWand/wandtest.tap
index f1dbc5f..5d1d3c8 100755
--- a/MagickWand/wandtest.sh
+++ b/MagickWand/wandtest.tap
@@ -10,5 +10,7 @@
set -e # Exit on any error
. ${srcdir}/MagickWand/common.sh
+echo "1..1"
-${MEMCHECK} ./wandtest wandtest_out.miff
+${MEMCHECK} ./wandtest wandtest_out.miff -validate compare && echo "ok" || echo "not ok"
+:
diff --git a/Makefile.in b/Makefile.in
index 24939cb..568a54f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4649,7 +4649,7 @@
MagickWand/MagickWand-config.1 \
MagickWand/MagickWand.pc.in \
MagickWand/sequence.miff \
- MagickWand/common.sh \
+ MagickWand/common.shi \
$(MAGICKWAND_TESTS)
MagickWand_drawtest_SOURCES = MagickWand/drawtest.c
@@ -4663,8 +4663,8 @@
MagickWand/wandtest
MAGICKWAND_TESTS = \
- MagickWand/drawtest.sh \
- MagickWand/wandtest.sh
+ MagickWand/drawtest.tap \
+ MagickWand/wandtest.tap
MAGICKWAND_CLEANFILES = \
MagickWand/*_out.*
@@ -5000,20 +5000,20 @@
tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
TESTS_XFAIL_TESTS =
TESTS_TESTS = \
- tests/validate-compare.sh \
- tests/validate-composite.sh \
- tests/validate-convert.sh \
- tests/validate-identify.sh \
- tests/validate-import.sh \
- tests/validate-montage.sh \
- tests/validate-pipe.sh \
- tests/validate-colorspace.sh \
- tests/validate-stream.sh \
- tests/validate-formats-in-memory.sh \
- tests/validate-formats-on-disk.sh
+ tests/validate-compare.tap \
+ tests/validate-composite.tap \
+ tests/validate-convert.tap \
+ tests/validate-identify.tap \
+ tests/validate-import.tap \
+ tests/validate-montage.tap \
+ tests/validate-pipe.tap \
+ tests/validate-colorspace.tap \
+ tests/validate-stream.tap \
+ tests/validate-formats-in-memory.tap \
+ tests/validate-formats-on-disk.tap
TESTS_EXTRA_DIST = \
- tests/common.sh \
+ tests/common.shi \
$(TESTS_TESTS)
TESTS_CLEANFILES =
diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index 2f36712..9ce170e 100644
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
<name>ImageMagick</name>
<shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
<homepage rdf:resource="http://www.imagemagick.org/"/>
- <created>2012-08-20</created>
+ <created>2012-08-21</created>
<description xml:lang="en">
ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@
<release>
<Version>
<name>stable</name>
- <created>2012-08-20</created>
+ <created>2012-08-21</created>
<revision>7.0.0</revision>
<patch-level>-0</patch-level>
</Version>
diff --git a/config/configure.xml b/config/configure.xml
index fe957b8..c083004 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
<configure name="VERSION" value="7.0.0"/>
<configure name="LIB_VERSION" value="0x700"/>
<configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
- <configure name="SVN_REVISION" value="9013:9029M" />
- <configure name="RELEASE_DATE" value="2012-08-20"/>
+ <configure name="SVN_REVISION" value="9013:9032M" />
+ <configure name="RELEASE_DATE" value="2012-08-21"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/configure b/configure
index 85c3e9d..1bd307c 100755
--- a/configure
+++ b/configure
@@ -3666,7 +3666,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=9013:9029M
+MAGICK_SVN_REVISION=9013:9032M
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6dfd7e9..629ae7a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,20 +24,20 @@
TESTS_XFAIL_TESTS =
TESTS_TESTS = \
- tests/validate-compare.sh \
- tests/validate-composite.sh \
- tests/validate-convert.sh \
- tests/validate-identify.sh \
- tests/validate-import.sh \
- tests/validate-montage.sh \
- tests/validate-pipe.sh \
- tests/validate-colorspace.sh \
- tests/validate-stream.sh \
- tests/validate-formats-in-memory.sh \
- tests/validate-formats-on-disk.sh
+ tests/validate-compare.tap \
+ tests/validate-composite.tap \
+ tests/validate-convert.tap \
+ tests/validate-identify.tap \
+ tests/validate-import.tap \
+ tests/validate-montage.tap \
+ tests/validate-pipe.tap \
+ tests/validate-colorspace.tap \
+ tests/validate-stream.tap \
+ tests/validate-formats-in-memory.tap \
+ tests/validate-formats-on-disk.tap
TESTS_EXTRA_DIST = \
- tests/common.sh \
+ tests/common.shi \
$(TESTS_TESTS)
TESTS_CLEANFILES =
diff --git a/tests/common.sh b/tests/common.shi
similarity index 100%
rename from tests/common.sh
rename to tests/common.shi