[svn-r6589]

Purpose: Bug fix

Description: h5import tests will fail if srcdir option
             is used with configure.

Solution: Modified h5importtest.c h5importtestutil.sh files
          to search for input files in the proper directory and
          to write output files to the proper directory.

Platforms tested: Tested on burrwhite, arabica, and modi4.
                  Unfortunately srcdir option was used only on
                  arabica, since I am having a weird 'timezone'
                  problem on all Linux machines when srcdir is used, and
                  on modi4 build has to be done in the same directory (at
                  least this is a message I am getting from configure;
                  should it work?)

Misc. update:

1 files changed, 23 insertions, 19 deletions

diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index 40ce7f5..c8f3f01 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -16,12 +16,12 @@ err=0
 ./h5import $*
 ../h5dump/h5dump $5 >log2
 
-cd testfiles
+cd tmp_testfiles
 ../../h5dump/h5dump $5 >log1
 cd ..
 
-cmp -s testfiles/log1 log2 || err=1
-rm -f log2 testfiles/log1
+cmp -s tmp_testfiles/log1 log2 || err=1
+rm -f log2 tmp_testfiles/log1
 if [ $err -eq 1 ]; then
 errors="` expr $errors + 1 `";
   echo "*FAILED*"
@@ -38,51 +38,55 @@ echo "=============================="
 if [ -f h5import -a -f h5importtest ]; then
 #echo "** Testing h5import  ***"
 
-rm -f  output.h5 log1 testfiles/tx* testfiles/b* *.dat
+rm -f  output.h5 log1 tx* b* *.dat
+
+mkdir tmp_testfiles
+cp $srcdir/testfiles/*.h5 tmp_testfiles/
 
 ./h5importtest
 
 TESTING "ASCII I32 rank 3 - Output BE " ;
-TOOLTEST testfiles/txtin32 -c testfiles/textin32 -o test1.h5
+TOOLTEST txtin32 -c $srcdir/testfiles/textin32 -o test1.h5
 
 TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
-TOOLTEST testfiles/txtin16 -c testfiles/textin16 -o test2.h5
+TOOLTEST txtin16 -c $srcdir/testfiles/textin16 -o test2.h5
 
 TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed " 
-TOOLTEST testfiles/txtin16 -c testfiles/textin8  -o test3.h5
+TOOLTEST txtin16 -c $srcdir/testfiles/textin8  -o test3.h5
 
 TESTING "ASCII UI32 - rank 3 - Output BE" 
-TOOLTEST testfiles/in1 -c testfiles/textuin32 -o test4.h5
+TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin32 -o test4.h5
 
 TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
-TOOLTEST testfiles/in1 -c testfiles/textuin16 -o test5.h5
+TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin16 -o test5.h5
 
 TESTING "ASCII F32 - rank 3 - Output LE " 
-TOOLTEST testfiles/fp1 -c testfiles/textfp32 -o test6.h5
+TOOLTEST $srcdir/testfiles/fp1 -c $srcdir/testfiles/textfp32 -o test6.h5
 
 TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
-TOOLTEST testfiles/fp2 -c testfiles/textfp64 -o test7.h5
+TOOLTEST $srcdir/testfiles/fp2 -c $srcdir/testfiles/textfp64 -o test7.h5
 
 TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
-TOOLTEST testfiles/bfp64 -c testfiles/conbfp64 -o test8.h5
+TOOLTEST bfp64 -c $srcdir/testfiles/conbfp64 -o test8.h5
 
 TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
-TOOLTEST testfiles/bin16 -c testfiles/conbin16 -o test9.h5
+TOOLTEST bin16 -c $srcdir/testfiles/conbin16 -o test9.h5
 
 TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
-TOOLTEST testfiles/bin8 -c testfiles/conbin8  -o test10.h5
+TOOLTEST bin8 -c $srcdir/testfiles/conbin8  -o test10.h5
 
 TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED " 
-TOOLTEST testfiles/bin32 -c testfiles/conbin32 -o test11.h5
+TOOLTEST bin32 -c $srcdir/testfiles/conbin32 -o test11.h5
 
 TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
-TOOLTEST testfiles/buin16 -c testfiles/conbuin16 -o test12.h5
+TOOLTEST buin16 -c $srcdir/testfiles/conbuin16 -o test12.h5
 
 TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED " 
-TOOLTEST testfiles/buin32 -c testfiles/conbuin32 -o test13.h5
+TOOLTEST buin32 -c $srcdir/testfiles/conbuin32 -o test13.h5
 
-rm -f  testfiles/tx* testfiles/b* *.dat
-rm -f  test*.h5 testfiles/test*.log
+rm -f  tx* b* *.dat
+rm -f  test*.h5 
+rm -rf tmp_testfiles
 else
 	echo "** h5import or h5importtest not available ***"
 	errors="` expr $errors + 1 `";