(no commit message)

diff --git a/common.shi.in b/common.shi.in
index 87ee69ac133e6b2b04c3a6737693f1f7cb24a235..b12ac9ebbfd068d68cead3e547329703b9388a45 100644 (file)
--- a/common.shi.in
+++ b/common.shi.in
@@ -14,7 +14,6 @@ MONTAGE="@abs_top_builddir@/utilities/montage"
 VALIDATE="@abs_top_builddir@/tests/validate"
 DRAWTEST="@abs_top_builddir@/tests/drawtest"
 WANDTEST="@abs_top_builddir@/tests/wandtest"
-REFERENCE_IMAGE="@abs_top_builddir@/tests/rose.pnm"
 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@'

diff --git a/tests/validate-pipe.tap b/tests/validate-pipe.tap
index ff4f3830c55dc551ebf2181bcb1eaac5aea32674..49fa69c3716b3aed475f77059b627382edc87294 100755 (executable)
--- a/tests/validate-pipe.tap
+++ b/tests/validate-pipe.tap
@@ -21,35 +21,35 @@ set -e # Exit on any error
 . ${srcdir}/tests/common.shi
 echo "1..17"
 
-${MAGICK} pnm:- null:   < ${REFERENCE_IMAGE} && echo "ok" || echo "not ok"
-${MAGICK} pnm:- info:   < ${REFERENCE_IMAGE} && echo "ok" || echo "not ok"
-${MAGICK} pnm:- miff:-  < ${REFERENCE_IMAGE} | ${IDENTIFY} - && echo "ok" || echo "not ok"
-${MAGICK} pnm:- -       < ${REFERENCE_IMAGE} | ${IDENTIFY} - && echo "ok" || echo "not ok"
-${MAGICK} ${REFERENCE_IMAGE} -write null:  null: && echo "ok" || echo "not ok"
-${MAGICK} ${REFERENCE_IMAGE} -write info:  null: && echo "ok" || echo "not ok"
-${MAGICK} ${REFERENCE_IMAGE} -write miff:- null: | ${IDENTIFY} - && echo "ok" || echo "not ok"
-${MAGICK} ${REFERENCE_IMAGE} -write -      null: | ${IDENTIFY} - && echo "ok" || echo "not ok"
+${MAGICK} pnm:- null:   < ${SRCDIR}/rose.pnm && echo "ok" || echo "not ok"
+${MAGICK} pnm:- info:   < ${SRCDIR}/rose.pnm && echo "ok" || echo "not ok"
+${MAGICK} pnm:- miff:-  < ${SRCDIR}/rose.pnm | ${IDENTIFY} - && echo "ok" || echo "not ok"
+${MAGICK} pnm:- -       < ${SRCDIR}/rose.pnm | ${IDENTIFY} - && echo "ok" || echo "not ok"
+${MAGICK} ${SRCDIR}/rose.pnm -write null:  null: && echo "ok" || echo "not ok"
+${MAGICK} ${SRCDIR}/rose.pnm -write info:  null: && echo "ok" || echo "not ok"
+${MAGICK} ${SRCDIR}/rose.pnm -write miff:- null: | ${IDENTIFY} - && echo "ok" || echo "not ok"
+${MAGICK} ${SRCDIR}/rose.pnm -write -      null: | ${IDENTIFY} - && echo "ok" || echo "not ok"
 
 # IMv7 "magick" testing
 # -read option
-${MAGICK} -read ${REFERENCE_IMAGE} info: && echo "ok" || echo "not ok"
+${MAGICK} -read ${SRCDIR}/rose.pnm info: && echo "ok" || echo "not ok"
 # -exit can be used insted of implicit write
-${MAGICK} ${REFERENCE_IMAGE} -write info: -exit && echo "ok" || echo "not ok"
+${MAGICK} ${SRCDIR}/rose.pnm -write info: -exit && echo "ok" || echo "not ok"
 # null: does not require an image during write
 ${MAGICK} -write null: -exit && echo "ok" || echo "not ok"
 # implied write null: without image
-${MAGICK} ${REFERENCE_IMAGE} -write info: +delete null: && echo "ok" || echo "not ok"
+${MAGICK} ${SRCDIR}/rose.pnm -write info: +delete null: && echo "ok" || echo "not ok"
 # Write to file decriptor
-${MAGICK} ${REFERENCE_IMAGE} fd:6  6>&1 | ${IDENTIFY} - && echo "ok" || echo "not ok"
+${MAGICK} ${SRCDIR}/rose.pnm fd:6  6>&1 | ${IDENTIFY} - && echo "ok" || echo "not ok"
 # Read from file decriptor
-exec 5<${REFERENCE_IMAGE}
+exec 5<${SRCDIR}/rose.pnm
 ${MAGICK} fd:5 info: && echo "ok" || echo "not ok"
 exec 5<&-
 # pipelined magick script
-echo "-read ${REFERENCE_IMAGE} -write info:" | ${MAGICK} -script - && echo "ok" || echo "not ok"
+echo "-read ${SRCDIR}/rose.pnm -write info:" | ${MAGICK} -script - && echo "ok" || echo "not ok"
 # pipelined magick script, input image pre-read
-echo "-write info:" | ${MAGICK} ${REFERENCE_IMAGE} -script - && echo "ok" || echo "not ok"
+echo "-write info:" | ${MAGICK} ${SRCDIR}/rose.pnm -script - && echo "ok" || echo "not ok"
 # pipelined script from file descriptor, read image from stdin
 echo "-read pnm:- -write info:" |\
-   ${MAGICK} -script fd:5 5<&0 <${REFERENCE_IMAGE} && echo "ok" || echo "not ok"
+   ${MAGICK} -script fd:5 5<&0 <${SRCDIR}/rose.pnm && echo "ok" || echo "not ok"
 :