From a9e4f5dd67e975250ebe723e421735848d00c093 Mon Sep 17 00:00:00 2001
From: anthony <anthony@git.imagemagick.org>
Date: Thu, 12 Apr 2012 06:44:02 +0000
Subject: [PATCH]

---
 MagickWand/operation.c | 2 +-
 tests/common.sh        | 2 ++
 tests/validate-pipe.sh | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 4f2f2849b..65982cb71 100644
--- 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 6e6c0f5e9..23302d119 100644
--- 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 ccfd30203..0fe101fb0 100755
--- 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}
-- 
2.40.0