diff options
Diffstat (limited to 'test/Execute-Tests')
-rwxr-xr-x | test/Execute-Tests | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/test/Execute-Tests b/test/Execute-Tests index 3530d978..c86121dc 100755 --- a/test/Execute-Tests +++ b/test/Execute-Tests @@ -50,7 +50,7 @@ esac # invoke, the list of tests to run ('Test-Order'), and *.ok files that # indicate the expected results of tests. -srcdir=$(dirname $0) +export srcdir=$(dirname $0) # Set tmpdir, which is used in some of the test scripts. By default # this is created by mktemp. The user can override and specify tmpdir, @@ -103,6 +103,10 @@ if [ ! -f ./testgrid.pbm ] then cp -v ${srcdir}/testgrid.pbm ./testgrid.pbm fi +if [ ! -f ./maze.pbm ] + then cp -v ${srcdir}/maze.pbm ./maze.pbm +fi + if [ ! -f ./testimg.ppm ] then cp -v ${srcdir}/testimg.ppm ./testimg.ppm fi @@ -178,13 +182,15 @@ elif [ $VALGRIND_TESTS = "on" ] mkdir $valdir vg_command_base="valgrind --trace-children=yes"; + # You may want to add --track-origins=yes to the above. for i in awk basename cat cksum cmp comm cp cut date dirname \ - egrep fgrep file grep gs head iconv mkdir mktemp perl rm \ - sed seq sh sort tee tr uniq wc \ + egrep fgrep file grep gs head iconv ls mkdir mktemp perl \ + printf rm sed seq sh sort tail tee tr uniq wc \ testrandom Available-Testprog # Tell valgrind not to probe execution of the above programs. + # You may add programs in Netpbm to the above to speed up tests. do vg_skip=$vg_skip"/*/"$i","; done; @@ -238,13 +244,15 @@ if [ $VALGRIND_TESTS = "on" ] fi # Execute a single test and test its result. -# But first check if the .ok file exists. (Some .ok files are -# dynamically created.) Then see if target programs and requirements -# are in place. If either of these conditions are not met, do -# not execute the test and report "Not Testable". +# But first check if the .ok file exists. +# (In past versions certain .ok files were dynamically created.) +# Then see if target programs and requirements are in place. If +# either of these conditions are not met, do not execute the test and +# report "Not Testable". if [ ! -s ${srcdir}/${tname%.test}.ok ] then + echo "${tname%.test}.ok does not exist" let result=4; else ${srcdir}/Available-Testprog \ @@ -296,7 +304,7 @@ fi # (Do not erase them if we are working from the source directory.) if [ ! $PWD -ef ${srcdir} ] - then rm ./testimg.ppm ./testgrid.pbm + then rm ./testimg.ppm ./testgrid.pbm ./maze.pbm fi |