use aliases to make tests easier to read and modify; add white line to top in Pnmshear test

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2098 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 9 insertions, 3 deletions

diff --git a/test/pnmremap1.test b/test/pnmremap1.test
index 1e68c8ad..208be2fb 100755
--- a/test/pnmremap1.test
+++ b/test/pnmremap1.test
@@ -2,9 +2,15 @@
 # This script tests: pnmremap
 # Also requires: pamdepth pamseq pamtopnm
 
-${PBM_BINPREFIX}pamseq 3 5 -tupletype=RGB | ${PBM_BINPREFIX}pamtopnm \
+  alias pnmremap="${PBM_TESTPREFIX}pnmremap"
+  alias pamdepth="${PBM_BINPREFIX}pamdepth"
+  alias pamseq="${PBM_BINPREFIX}pamseq"
+  alias pamtopnm="${PBM_BINPREFIX}pamtopnm"
+  shopt -s expand_aliases
+
+pamseq 3 5 -tupletype=RGB | pamtopnm \
  > ${tmpdir}/palette
-${PBM_BINPREFIX}pamdepth 255 ${tmpdir}/palette > ${tmpdir}/palette255
+pamdepth 255 ${tmpdir}/palette > ${tmpdir}/palette255
 
 # Test 1. Floyd-Steinberg
 # This fails with older versions of Netpbm and x86-64.
@@ -13,7 +19,7 @@ ${PBM_BINPREFIX}pamdepth 255 ${tmpdir}/palette > ${tmpdir}/palette255
 # x86-32: 2667816854 101482 
 # x86-64: 3602410851 101482
 
-${PBM_TESTPREFIX}pnmremap -mapfile=${tmpdir}/palette -floyd -norandom \
+pnmremap -mapfile=${tmpdir}/palette -floyd -norandom \
  testimg.ppm | cksum
 
 rm ${tmpdir}/palette{,255}