(no commit message)

diff --git a/Magick++/demo/demos.tap b/Magick++/demo/demos.tap
index 77fa4fb0f14c8ecf9d62d6afd7b9fad61f299c62..21f9e68760c18911b0406f276fc853ebb23b29c1 100755 (executable)
--- a/Magick++/demo/demos.tap
+++ b/Magick++/demo/demos.tap
@@ -6,14 +6,14 @@
 # ImageMagick.  Please see the file "COPYING" included with Magick++
 # for usage and copying restrictions.
 #
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR && pwd`/
-TOPSRCDIR=`cd $srcdir && pwd`
-export SRCDIR
+SRCDIR=Magick++/demo
 . ./common.shi
 echo "1..24"
 
-cd Magick++/demo || exit 1
+SRCDIR=${top_srcdir}/${subdir}/
+export SRCDIR
+
+cd ${subdir} || exit 1
 
 ./analyze "$SRCDIR/model.miff" && echo "ok" || echo "not ok"
 

diff --git a/Magick++/tests/tests.tap b/Magick++/tests/tests.tap
index 71c229a46a84d104623f4442fa55043e1bad8826..e3a6c86fee91858af76fa7ea3435250244e60d84 100755 (executable)
--- a/Magick++/tests/tests.tap
+++ b/Magick++/tests/tests.tap
@@ -6,13 +6,14 @@
 # ImageMagick.  Please see the file "COPYING" included with Magick++
 # for usage and copying restrictions.
 #
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR && pwd`/
-export SRCDIR
+SRCDIR=Magick++/demo
 . ./common.shi
-echo "1..12"
+echo "1..24"
+
+SRCDIR=${top_srcdir}/${subdir}/
+export SRCDIR
 
-cd Magick++/tests || exit 1
+cd ${subdir} || exit 1
 
 for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions montageImages morphImages readWriteBlob readWriteImages
 do

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 703189fcdb69720533687630f4cdf72828fdec3f..7d33f24f1e02bd700bd70432597cc4154209613a 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  8
 #define MagickLibMinInterface  8
-#define MagickReleaseDate  "2012-12-28"
+#define MagickReleaseDate  "2012-12-29"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "HDRI OpenMP"

diff --git a/common.shi.in b/common.shi.in
index b12ac9ebbfd068d68cead3e547329703b9388a45..67a0f600f35099bce62c2366d0fbd7bfa140a331 100644 (file)
--- a/common.shi.in
+++ b/common.shi.in
@@ -15,8 +15,8 @@ VALIDATE="@abs_top_builddir@/tests/validate"
 DRAWTEST="@abs_top_builddir@/tests/drawtest"
 WANDTEST="@abs_top_builddir@/tests/wandtest"
 LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}"
-MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@'
-MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@'
-MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@'
+MAGICK_CODER_MODULE_PATH="@abs_top_builddir@/coders"
+MAGICK_CONFIGURE_PATH="@abs_top_builddir@/config"
+MAGICK_FILTER_MODULE_PATH="@abs_top_builddir@/filters"
 PATH="@abs_top_builddir@/utilities:${PATH}"
 set +a

diff --git a/tests/cli-colorspace.tap b/tests/cli-colorspace.tap
index d5c2f10cb811e219fe1d189b980f824b9b92410a..0491af91a6c93ccffd6814da8979ae5d92a1de86 100755 (executable)
--- a/tests/cli-colorspace.tap
+++ b/tests/cli-colorspace.tap
@@ -14,6 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+. ./common.shi
 . ${srcdir}/tests/common.shi
 
 depth=`eval ${MAGICK} xc:none -format '%[fx:QuantumRange]' info:-`

diff --git a/tests/cli-pipe.tap b/tests/cli-pipe.tap
index b6803e9e4b5e4dca68af4c880df8f08b13d2f70b..0726ab8e16f25a4af70eef4e577e1b4115a6df16 100755 (executable)
--- a/tests/cli-pipe.tap
+++ b/tests/cli-pipe.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-set -e # Exit on any error
-[ "X$srcdir" = "X" ] && srcdir=`pwd`
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..17"
 

diff --git a/tests/drawtest.tap b/tests/drawtest.tap
index 787732d2cb5f31c8e3a447be118e90d2f595113b..8e5557f74b51d815cc4e68922b93b649b75d2959 100755 (executable)
--- a/tests/drawtest.tap
+++ b/tests/drawtest.tap
@@ -5,8 +5,7 @@
 # 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
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-compare.tap b/tests/validate-compare.tap
index e6b52670a6fd330d98d79fcd9dd44d7239f64224..86fd1cd0e153d87fd2dfea8f2bafde78580e795d 100755 (executable)
--- a/tests/validate-compare.tap
+++ b/tests/validate-compare.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-composite.tap b/tests/validate-composite.tap
index 567c787d8767297c662739d42be84eead10dec27..13a58dc01712d5a6a516ee6222c72e3ebac87342 100755 (executable)
--- a/tests/validate-composite.tap
+++ b/tests/validate-composite.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-convert.tap b/tests/validate-convert.tap
index 97371663740743702303b04b01307f3d34ee5c5c..c5383e50e8e894da4fc8dc5bdaacf480366abb00 100755 (executable)
--- a/tests/validate-convert.tap
+++ b/tests/validate-convert.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-formats-in-memory.tap b/tests/validate-formats-in-memory.tap
index d7c3355fa59daadb50bc16f64ec54fac64baddc0..94434555cd283f96ff9a1337e8e2b282f1155885 100755 (executable)
--- a/tests/validate-formats-in-memory.tap
+++ b/tests/validate-formats-in-memory.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-formats-on-disk.tap b/tests/validate-formats-on-disk.tap
index 624c0ce0d43428fae3c27337c697eec099ecd281..b588aeb659069c03ce81843b2d8089169fff43f9 100755 (executable)
--- a/tests/validate-formats-on-disk.tap
+++ b/tests/validate-formats-on-disk.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-identify.tap b/tests/validate-identify.tap
index 16df7cf09d1d363e4e3bf13947894dd94bca0583..ca01eb84f40224bcc1ea3ba939ce1336c973b199 100755 (executable)
--- a/tests/validate-identify.tap
+++ b/tests/validate-identify.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-import.tap b/tests/validate-import.tap
index 433b885ce4640a6c28391c882f10e9271052754b..ec1f42c89979b7443cbf1c74929aa15913b77493 100755 (executable)
--- a/tests/validate-import.tap
+++ b/tests/validate-import.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-montage.tap b/tests/validate-montage.tap
index f429d8c48f8903a48dee46950f4fb8625db00cbf..b21c701af68160e6c8134ec96347629706e51f18 100755 (executable)
--- a/tests/validate-montage.tap
+++ b/tests/validate-montage.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/validate-stream.tap b/tests/validate-stream.tap
index 05b0d076cfcd3d7410494bbd78fc5245a3171a3e..25bdcb8cf6c3f0fc38c78f1df5f2055b43639d8d 100755 (executable)
--- a/tests/validate-stream.tap
+++ b/tests/validate-stream.tap
@@ -16,8 +16,7 @@
 #
 #  Test for 'validate' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"
 

diff --git a/tests/wandtest.tap b/tests/wandtest.tap
index 31c8b929951c10a62f68d634bf1a269a4246db18..42d734a4ab151b9c360eb499268c37bfcc4f7ccf 100755 (executable)
--- a/tests/wandtest.tap
+++ b/tests/wandtest.tap
@@ -7,8 +7,7 @@
 #
 #  Test for '${CONVERT}' utility.
 #
-
-set -e # Exit on any error
+. ./common.shi
 . ${srcdir}/tests/common.shi
 echo "1..1"