From d51febce3146aaf426f8700de01d6c5279de0a9d Mon Sep 17 00:00:00 2001 From: giraffedata Date: Thu, 17 Oct 2013 23:31:02 +0000 Subject: Move test helper program 'testrandom' from buildtools directory to test directory. One reason is to fix parallel build break due to testrandom depending upon stuff in lib/ directory git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2018 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- test/Execute-Tests | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'test/Execute-Tests') diff --git a/test/Execute-Tests b/test/Execute-Tests index c2fd9d52..7a1a3793 100755 --- a/test/Execute-Tests +++ b/test/Execute-Tests @@ -39,16 +39,10 @@ fi # export PBM_BINPREFIX="" export PBM_BINPREFIX=${PBM_TESTPREFIX} -# Add PBM_BINPREFIX to PATH. -# This is necessary for Netpbm programs that call other Netpbm programs. - -if [ ! -z $PBM_BINPREFIX ] - then - export PATH=${PBM_BINPREFIX}:$PATH -fi - -# Set srcdir, which is the directory which contains Execute-Tests -# (this script), Test-Order *.test and *.ok files. +# Set srcdir, which is the directory which contains Execute-Tests (this +# script), programs that run the test, including *.test and helpers that they +# invoke, the list of tests to run ('Test-Order'), and *.ok files that +# indicate the expected results of tests. srcdir=$(dirname $0) @@ -100,6 +94,16 @@ if [ ! -f ./testimg.ppm ] then cp -v ${srcdir}/testimg.ppm ./testimg.ppm fi +# Add PBM_BINPREFIX to PATH. +# This is necessary for Netpbm programs that call other Netpbm programs. + +if [ ! -z $PBM_BINPREFIX ] + then + export PATH=${PBM_BINPREFIX}:$PATH +fi + +export PATH=${srcdir}:$PATH + # Execute the tests, as described in the "Test-Order" file. # # Each test outputs a ".out" file, which is compared against a -- cgit 1.4.1