(no commit message)

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 4f2f2849b3d3856d59e12206ba9e2b43f130d308..65982cb716501a09dc8cc79273e730762e2cdfb7 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -4425,7 +4425,7 @@ WandExport void CLISpecialOperator(MagickCLI *cli_wand,
 
     /* Need images, unless a "null:" output coder is used */
     if ( cli_wand->wand.images == (Image *) NULL ) {
-      if ( LocaleCompare(option,"null:") == 0 )
+      if ( LocaleCompare(arg1,"null:") == 0 )
         return;
       CLIWandExceptArgReturn(OptionError,"NoImagesForWrite",option,arg1);
     }

diff --git a/tests/common.sh b/tests/common.sh
index 6e6c0f5e94f1647b898a7c0a3208dda6be8556ad..23302d119d68af0f69954bd2937949067962e074 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -2,5 +2,7 @@ SRCDIR=`dirname $0`
 SRCDIR=`cd $SRCDIR && pwd`
 TOPSRCDIR=`cd $srcdir && pwd`
 REFERENCE_IMAGE="${TOPSRCDIR}/images/rose.pnm"
+[ "X$MAGICK" = "X" ] && MAGICK=magick
+[ "X$IDENTIFY" = "X" ] && IDENTIFY=identify
 export SRCDIR TOPSRCDIR
 cd tests || exit 1

diff --git a/tests/validate-pipe.sh b/tests/validate-pipe.sh
index ccfd30203e2ac068db2c0ce8078f4bf919a9f715..0fe101fb08b692d4c784d0554709306f0e889813 100755 (executable)
--- a/tests/validate-pipe.sh
+++ b/tests/validate-pipe.sh
@@ -17,6 +17,7 @@
 #  Test for 'validate' utility.
 #
 set -e # Exit on any error
+[ "X$srcdir" = "X" ] && srcdir=`pwd`
 . ${srcdir}/tests/common.sh
 
 ${MAGICK} pnm:- null:   < ${REFERENCE_IMAGE}