5353export srcdir=$( dirname $0 )
5454
5555# Set tmpdir, which is used in some of the test scripts. By default
56- # this is created by mktemp. The user can override and specify tmpdir,
57- # but in this case it must be an existing directory and must not be
58- # either $srcdir or current work.
56+ # this is created by mktemp. To override edit the following lines.
57+
58+ # When tmpdir is specified it must be an existing directory and must
59+ # not be either $srcdir or current work. tmpdir should not contain
60+ # whitespace, non-printable characters, etc.
61+
62+ tmpdir_created=$( mktemp -d " ${TMPDIR:-/ tmp} /netpbm.XXXXXXXX" ) || exit 1;
63+ export tmpdir=${tmpdir_created}
5964
60- if [ -z $tmpdir ]
61- then
62- tmpdir_created=$( mktemp -d " ${TMPDIR:-/ tmp} /netpbm.XXXXXXXX" ) || exit 1;
63- export tmpdir=${tmpdir_created}
64- else
65- tmpdir_created=" " ;
66- if [ ! -d ${tmpdir} ]
67- then echo " Specified temporary directory $tmpdir does not exist."
68- exit 1;
69- elif [ ${tmpdir} -ef ${srcdir} ]
70- then echo " Temporary directory must not be $srcdir ."
71- exit 1;
72- elif [ ${tmpdir} -ef $PWD ]
73- then echo " Temporary directory must not be current directory."
74- exit 1;
75- fi
76- fi
7765
78- # If necessary set the RGBDEF environment variable.
79- # export RGBDEF=/etc/rgb.txt
80- # export RGBDEF=/usr/local/netpbm/lib/rgb.txt
81- # export RGBDEF=/usr/share/emacs/*/etc/rgb.txt
66+ # tmpdir_created=""
67+ # export tmpdir=/tmp/netpbm-test-tempdir
68+
69+ # if [ ! -d "${tmpdir}" ]
70+ # then echo "Specified temporary directory $tmpdir does not exist."
71+ # exit 1;
72+ # elif [ "${tmpdir}" -ef "${srcdir}" ]
73+ # then echo "Temporary directory must not be $srcdir."
74+ # exit 1;
75+ # elif [ "${tmpdir}" -ef "$PWD" ]
76+ # then echo "Temporary directory must not be current directory."
77+ # exit 1;
78+ # fi
79+ # fi
8280
8381
8482# Declare arrays used to count and report test results.
@@ -100,17 +98,29 @@ status[4]="NOT TESTABLE"
10098# Copy test image files to the current work directory
10199
102100if [ ! -f ./testgrid.pbm ]
103- then cp -v ${srcdir} /testgrid.pbm ./testgrid.pbm
101+ then cp -v " ${srcdir} "
104102fi
105103
106104if [ ! -f ./maze.pbm ]
107- then cp -v ${srcdir} /maze.pbm ./maze.pbm
105+ then cp -v " ${srcdir} "
108106fi
109107
110108if [ ! -f ./testimg.ppm ]
111- then cp -v ${srcdir} /testimg.ppm ./testimg.ppm
109+ then cp -v " ${srcdir} "
110+ fi
111+
112+ if [ ! -f ./rgbt.txt ]
113+ then cp -v " ${srcdir} "
114+ # Color name dictionary file rgbt.txt is a short digest.
115+ # If desired use the proper file:
116+ # cp -v /etc/rgb.txt ./rgbt.txt
117+ # cp -v $RGBDEF ./rgbt.txt
112118fi
113119
120+ if [ ! -f ./test-invalid.inc ]
121+ then cp -v " ${srcdir} "
122+ fi
123+
114124# The block-bin directory
115125#
116126# This directory contains dummy executables with the names of the
@@ -130,14 +140,14 @@ if [ ! -z $PBM_TEST_PATH ]
130140 then rm -rf $blockbin
131141 fi
132142 mkdir $blockbin
133- cp ${srcdir} /BLOCK $blockbin /BLOCK
143+ cp " ${srcdir} " $blockbin /BLOCK
134144 chmod +x $blockbin /BLOCK
135145
136146# Populate the block-bin directory using all-in-place.ok and
137147# legacy-names.ok which together make a complete list of programs.
138148
139149 sed ' s/: ok$//'
140- ${srcdir} /all-in-place.ok ${srcdir} /legacy-names.ok | \
150+ " ${srcdir} " " ${srcdir} " | \
141151 tr ' ' ' \n' | while read prog
142152 do
143153 ln -s $blockbin /BLOCK $blockbin /$prog
@@ -216,17 +226,17 @@ if [ ! -z $target ]
216226 echo $target | sed ' s/,/\n/g' | \
217227 sed -e ' s/^/# This script tests: .*\\</' ' s/$/\\>/'
218228 -e ' /^$/q' | \
219- grep -f - ${srcdir} /* .test -l | \
229+ grep -f - " ${srcdir} " * .test -l | \
220230 while read i ; do echo ${i##*/ } ; done | \
221- grep -f - ${srcdir} /Test-Order > ./Test-Order ;
231+ grep -f - " ${srcdir} " > ./Test-Order ;
222232 if [ ! -s ./Test-Order ]
223233 then echo ;
224234 echo " Error: No testable program names in target: " $target ;
225235 echo ; exit 1
226236 fi
227237else
228- cp ${srcdir} /Test-Order ./Test-Order ;
229- # cp --no-clobber ${srcdir}/Test-Order ./Test-Order ;
238+ cp " ${srcdir} " ;
239+ # cp --no-clobber " ${srcdir}" /Test-Order ./Test-Order ;
230240fi
231241
232242echo
250260# either of these conditions are not met, do not execute the test and
251261# report "Not Testable".
252262
253- if [ ! -s ${srcdir} /${tname% .test} .ok ]
263+ if [ ! -s " ${srcdir} " ${tname% .test} .ok ]
254264then
255265 echo " ${tname% .test} .ok does not exist"
256266 let result=4;
257267else
258- ${srcdir} /Available-Testprog \
268+ " ${srcdir} "
259269 ` sed -n -e ' /^# This script tests: /s/# This script tests: //p'
260270 -e ' /^# Also requires: /s/^# Also requires: //p'
261- -e ' /^$/q' ${srcdir} /$tname | tr ' \n' ' ' `
271+ -e ' /^$/q' " ${srcdir} " $tname | tr ' \n' ' ' `
262272 case $? in
263273 0)
264- PATH=${testpath} $vg_command ${srcdir} /$tname > ${tname% .test} .out;
274+ PATH=${testpath} $vg_command " ${srcdir} " $tname > ${tname% .test} .out;
265275 let retval=$?
266276 case $retval in
267- 0) cmp -s ${tname% .test} .out ${srcdir} /${tname% .test} .ok ;
277+ 0) cmp -s ${tname% .test} .out " ${srcdir} " ${tname% .test} .ok ;
268278 if [ $? -eq 0 ]
269279 then let result=0; rm ${tname% .test} .out ;
270280 else let result=1;
271- grep " ^##" ${srcdir} /$tname # Print failure message.
281+ grep " ^##" " ${srcdir} " $tname # Print failure message.
272282 fi ;;
273283 80) let result=4 ;;
274284 * ) let result=1 ;;
290300
291301# Erase temporary bin directory and its contents.
292302
293- rm -rf ${srcdir} /bin
303+ rm -rf " ${srcdir} "
294304
295305
296306# Erase temporary directory and its contents, if it was created.
303313# Erase test image files in the current (work) directory.
304314# (Do not erase them if we are working from the source directory.)
305315
306- if [ ! $PWD -ef ${srcdir} ]
307- then rm ./testimg.ppm ./testgrid.pbm ./maze.pbm
316+ if [ ! $PWD -ef " ${srcdir} "
317+ then rm ./testimg.ppm ./testgrid.pbm ./maze.pbm \
318+ ./rgbt.txt ./test-invalid.inc
308319fi
309320
310321
0 commit comments