[svn-r15750] move h5repack test files to /tools/h5repack/testfiles

tested: linux

19 files changed, 25 insertions, 23 deletions

diff --git a/MANIFEST b/MANIFEST
index b5d109d..74363fa 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1446,23 +1446,25 @@
 
 
 #test files for h5repack
-./tools/testfiles/h5repack_fill.h5
-./tools/testfiles/h5repack_objs.h5
-./tools/testfiles/h5repack_attr.h5
-./tools/testfiles/h5repack_hlink.h5
-./tools/testfiles/h5repack_layout.h5
-./tools/testfiles/h5repack_early.h5
-./tools/testfiles/h5repack_szip.h5
-./tools/testfiles/h5repack_deflate.h5
-./tools/testfiles/h5repack_shuffle.h5
-./tools/testfiles/h5repack_fletcher.h5
-./tools/testfiles/h5repack_filters.h5
-./tools/testfiles/h5repack_nbit.h5
-./tools/testfiles/h5repack_soffset.h5
-./tools/testfiles/info.h5repack
-./tools/testfiles/h5repack_ext.bin
-./tools/testfiles/h5repack_ext.h5
-./tools/testfiles/ublock.bin
+./tools/h5repack/testfiles/h5repack_szip.h5
+./tools/h5repack/testfiles/h5repack_fill.h5
+./tools/h5repack/testfiles/ublock.bin
+./tools/h5repack/testfiles/h5repack_ext.bin
+./tools/h5repack/testfiles/h5repack_fletcher.h5
+./tools/h5repack/testfiles/h5repack_nbit.h5
+./tools/h5repack/testfiles/h5repack_shuffle.h5
+./tools/h5repack/testfiles/h5repack_objs.h5
+./tools/h5repack/testfiles/h5repack.info
+./tools/h5repack/testfiles/h5repack_ext.h5
+./tools/h5repack/testfiles/h5repack_deflate.h5
+./tools/h5repack/testfiles/h5repack_hlink.h5
+./tools/h5repack/testfiles/h5repack_filters.h5
+./tools/h5repack/testfiles/h5repack_soffset.h5
+./tools/h5repack/testfiles/h5repack_attr.h5
+./tools/h5repack/testfiles/h5repack_early.h5
+./tools/h5repack/testfiles/h5repack_layout.h5
+
+
 
 
 # jam utility and tests
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index d5bb5c1..72e4414 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -33,10 +33,10 @@ H5REPACK_BIN=`pwd`/$H5REPACK    # The path of the tool binary
 H5DIFF=../h5diff/h5diff         # The h5diff tool name 
 H5DIFF_BIN=`pwd`/$H5DIFF        # The path of the h5diff  tool binary
 
-H5DETECTSZIP=testh5repack_detect_szip               # The tool name
-H5DETECTSZIP_BIN=`pwd`/$H5DETECTSZIP    # The path of the tool binary
+H5DETECTSZIP=testh5repack_detect_szip              
+H5DETECTSZIP_BIN=`pwd`/$H5DETECTSZIP    
 
-INFO_FILE=../testfiles/info.h5repack
+INFO_FILE=testfiles/h5repack.info
 
 FILE0=h5repack_fill.h5
 FILE1=h5repack_objs.h5
@@ -62,7 +62,7 @@ if test -z "$srcdir"; then
    srcdir=.
 fi
 
-test -d ../testfiles || mkdir ../testfiles
+
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
@@ -116,7 +116,7 @@ TOOLTEST()
     # case of missing file name).  Changed it to use $@ till Tflops fixes it.
     TESTING $H5REPACK $@
 
-    infile=$srcdir/../testfiles/$1
+    infile=$srcdir/testfiles/$1
     path=`pwd`
     outfile=$path/out.$1
     shift
@@ -144,7 +144,7 @@ TOOLTEST0()
     # case of missing file name).  Changed it to use $@ till Tflops fixes it.
     TESTING $H5REPACK $@
 
-    infile=$srcdir/../testfiles/$1
+    infile=$srcdir/testfiles/$1
     path=`pwd`
     outfile=$path/out.$1
     shift
diff --git a/tools/testfiles/info.h5repack b/tools/h5repack/testfiles/h5repack.info
index 216948d..216948d 100644
--- a/tools/testfiles/info.h5repack
+++ b/tools/h5repack/testfiles/h5repack.info
diff --git a/tools/testfiles/h5repack_attr.h5 b/tools/h5repack/testfiles/h5repack_attr.h5
index fe066db..fe066db 100644
--- a/tools/testfiles/h5repack_attr.h5
+++ b/tools/h5repack/testfiles/h5repack_attr.h5
diff --git a/tools/testfiles/h5repack_deflate.h5 b/tools/h5repack/testfiles/h5repack_deflate.h5
index 3a4b86d..3a4b86d 100644
--- a/tools/testfiles/h5repack_deflate.h5
+++ b/tools/h5repack/testfiles/h5repack_deflate.h5
diff --git a/tools/testfiles/h5repack_early.h5 b/tools/h5repack/testfiles/h5repack_early.h5
index 9b92890..9b92890 100644
--- a/tools/testfiles/h5repack_early.h5
+++ b/tools/h5repack/testfiles/h5repack_early.h5
diff --git a/tools/testfiles/h5repack_ext.bin b/tools/h5repack/testfiles/h5repack_ext.bin
index f858094..f858094 100644
--- a/tools/testfiles/h5repack_ext.bin
+++ b/tools/h5repack/testfiles/h5repack_ext.bin
diff --git a/tools/testfiles/h5repack_ext.h5 b/tools/h5repack/testfiles/h5repack_ext.h5
index 1fe88c9..1fe88c9 100644
--- a/tools/testfiles/h5repack_ext.h5
+++ b/tools/h5repack/testfiles/h5repack_ext.h5
diff --git a/tools/testfiles/h5repack_fill.h5 b/tools/h5repack/testfiles/h5repack_fill.h5
index 21516cb..21516cb 100644
--- a/tools/testfiles/h5repack_fill.h5
+++ b/tools/h5repack/testfiles/h5repack_fill.h5
diff --git a/tools/testfiles/h5repack_filters.h5 b/tools/h5repack/testfiles/h5repack_filters.h5
index 042b8db..042b8db 100644
--- a/tools/testfiles/h5repack_filters.h5
+++ b/tools/h5repack/testfiles/h5repack_filters.h5
diff --git a/tools/testfiles/h5repack_fletcher.h5 b/tools/h5repack/testfiles/h5repack_fletcher.h5
index 2f137b0..2f137b0 100644
--- a/tools/testfiles/h5repack_fletcher.h5
+++ b/tools/h5repack/testfiles/h5repack_fletcher.h5
diff --git a/tools/testfiles/h5repack_hlink.h5 b/tools/h5repack/testfiles/h5repack_hlink.h5
index 3d22728..3d22728 100644
--- a/tools/testfiles/h5repack_hlink.h5
+++ b/tools/h5repack/testfiles/h5repack_hlink.h5
diff --git a/tools/testfiles/h5repack_layout.h5 b/tools/h5repack/testfiles/h5repack_layout.h5
index 5772a31..5772a31 100644
--- a/tools/testfiles/h5repack_layout.h5
+++ b/tools/h5repack/testfiles/h5repack_layout.h5
diff --git a/tools/testfiles/h5repack_nbit.h5 b/tools/h5repack/testfiles/h5repack_nbit.h5
index 3ada112..3ada112 100644
--- a/tools/testfiles/h5repack_nbit.h5
+++ b/tools/h5repack/testfiles/h5repack_nbit.h5
diff --git a/tools/testfiles/h5repack_objs.h5 b/tools/h5repack/testfiles/h5repack_objs.h5
index 0a0c041..0a0c041 100644
--- a/tools/testfiles/h5repack_objs.h5
+++ b/tools/h5repack/testfiles/h5repack_objs.h5
diff --git a/tools/testfiles/h5repack_shuffle.h5 b/tools/h5repack/testfiles/h5repack_shuffle.h5
index d13cca7..d13cca7 100644
--- a/tools/testfiles/h5repack_shuffle.h5
+++ b/tools/h5repack/testfiles/h5repack_shuffle.h5
diff --git a/tools/testfiles/h5repack_soffset.h5 b/tools/h5repack/testfiles/h5repack_soffset.h5
index 89ee99a..89ee99a 100644
--- a/tools/testfiles/h5repack_soffset.h5
+++ b/tools/h5repack/testfiles/h5repack_soffset.h5
diff --git a/tools/testfiles/h5repack_szip.h5 b/tools/h5repack/testfiles/h5repack_szip.h5
index b16d169..b16d169 100644
--- a/tools/testfiles/h5repack_szip.h5
+++ b/tools/h5repack/testfiles/h5repack_szip.h5
diff --git a/tools/testfiles/ublock.bin b/tools/h5repack/testfiles/ublock.bin
index b2d03f3..b2d03f3 100644
--- a/tools/testfiles/ublock.bin
+++ b/tools/h5repack/testfiles/ublock.bin