From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 29 Dec 2012 22:54:19 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4522
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a350cf9e9931754ab05c4425fe1403269625343;p=imagemagick

---

diff --git a/Magick++/demo/demos.tap b/Magick++/demo/demos.tap
index 77fa4fb0f..21f9e6876 100755
--- 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 71c229a46..e3a6c86fe 100755
--- 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 703189fcd..7d33f24f1 100644
--- 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 b12ac9ebb..67a0f600f 100644
--- 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 d5c2f10cb..0491af91a 100755
--- 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 b6803e9e4..0726ab8e1 100755
--- 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 787732d2c..8e5557f74 100755
--- 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 e6b52670a..86fd1cd0e 100755
--- 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 567c787d8..13a58dc01 100755
--- 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 973716637..c5383e50e 100755
--- 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 d7c3355fa..94434555c 100755
--- 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 624c0ce0d..b588aeb65 100755
--- 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 16df7cf09..ca01eb84f 100755
--- 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 433b885ce..ec1f42c89 100755
--- 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 f429d8c48..b21c701af 100755
--- 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 05b0d076c..25bdcb8cf 100755
--- 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 31c8b9299..42d734a4a 100755
--- 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"