[svn-r15238]

Moved all h5diff testfiles from /tools/testfiles to tools/h5diff/testfiles

Tested: linux, solaris

76 files changed, 6 insertions, 5 deletions

diff --git a/tools/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index 6a6dbae..6a6dbae 100644
--- a/tools/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
diff --git a/tools/testfiles/h5diff_100.txt b/tools/h5diff/testfiles/h5diff_100.txt
index 82b42ce..82b42ce 100644
--- a/tools/testfiles/h5diff_100.txt
+++ b/tools/h5diff/testfiles/h5diff_100.txt
diff --git a/tools/testfiles/h5diff_101.txt b/tools/h5diff/testfiles/h5diff_101.txt
index 7affe59..7affe59 100644
--- a/tools/testfiles/h5diff_101.txt
+++ b/tools/h5diff/testfiles/h5diff_101.txt
diff --git a/tools/testfiles/h5diff_102.txt b/tools/h5diff/testfiles/h5diff_102.txt
index dba340b..dba340b 100644
--- a/tools/testfiles/h5diff_102.txt
+++ b/tools/h5diff/testfiles/h5diff_102.txt
diff --git a/tools/testfiles/h5diff_11.txt b/tools/h5diff/testfiles/h5diff_11.txt
index 988afe8..988afe8 100644
--- a/tools/testfiles/h5diff_11.txt
+++ b/tools/h5diff/testfiles/h5diff_11.txt
diff --git a/tools/testfiles/h5diff_12.txt b/tools/h5diff/testfiles/h5diff_12.txt
index 666a91b..666a91b 100644
--- a/tools/testfiles/h5diff_12.txt
+++ b/tools/h5diff/testfiles/h5diff_12.txt
diff --git a/tools/testfiles/h5diff_13.txt b/tools/h5diff/testfiles/h5diff_13.txt
index 834f809..834f809 100644
--- a/tools/testfiles/h5diff_13.txt
+++ b/tools/h5diff/testfiles/h5diff_13.txt
diff --git a/tools/testfiles/h5diff_14.txt b/tools/h5diff/testfiles/h5diff_14.txt
index d0f75b5..d0f75b5 100644
--- a/tools/testfiles/h5diff_14.txt
+++ b/tools/h5diff/testfiles/h5diff_14.txt
diff --git a/tools/testfiles/h5diff_15.txt b/tools/h5diff/testfiles/h5diff_15.txt
index 529ffc5..529ffc5 100644
--- a/tools/testfiles/h5diff_15.txt
+++ b/tools/h5diff/testfiles/h5diff_15.txt
diff --git a/tools/testfiles/h5diff_16_1.txt b/tools/h5diff/testfiles/h5diff_16_1.txt
index 738a0f7..738a0f7 100644
--- a/tools/testfiles/h5diff_16_1.txt
+++ b/tools/h5diff/testfiles/h5diff_16_1.txt
diff --git a/tools/testfiles/h5diff_16_2.txt b/tools/h5diff/testfiles/h5diff_16_2.txt
index 421bf70..421bf70 100644
--- a/tools/testfiles/h5diff_16_2.txt
+++ b/tools/h5diff/testfiles/h5diff_16_2.txt
diff --git a/tools/testfiles/h5diff_16_3.txt b/tools/h5diff/testfiles/h5diff_16_3.txt
index 0721799..0721799 100644
--- a/tools/testfiles/h5diff_16_3.txt
+++ b/tools/h5diff/testfiles/h5diff_16_3.txt
diff --git a/tools/testfiles/h5diff_17.txt b/tools/h5diff/testfiles/h5diff_17.txt
index 1d93779..1d93779 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/h5diff/testfiles/h5diff_17.txt
diff --git a/tools/testfiles/h5diff_18.txt b/tools/h5diff/testfiles/h5diff_18.txt
index 24c2e32..24c2e32 100644
--- a/tools/testfiles/h5diff_18.txt
+++ b/tools/h5diff/testfiles/h5diff_18.txt
diff --git a/tools/testfiles/h5diff_20.txt b/tools/h5diff/testfiles/h5diff_20.txt
index ebdcd9a..ebdcd9a 100644
--- a/tools/testfiles/h5diff_20.txt
+++ b/tools/h5diff/testfiles/h5diff_20.txt
diff --git a/tools/testfiles/h5diff_21.txt b/tools/h5diff/testfiles/h5diff_21.txt
index 647b58d..647b58d 100644
--- a/tools/testfiles/h5diff_21.txt
+++ b/tools/h5diff/testfiles/h5diff_21.txt
diff --git a/tools/testfiles/h5diff_22.txt b/tools/h5diff/testfiles/h5diff_22.txt
index b664837..b664837 100644
--- a/tools/testfiles/h5diff_22.txt
+++ b/tools/h5diff/testfiles/h5diff_22.txt
diff --git a/tools/testfiles/h5diff_23.txt b/tools/h5diff/testfiles/h5diff_23.txt
index 74c858a..74c858a 100644
--- a/tools/testfiles/h5diff_23.txt
+++ b/tools/h5diff/testfiles/h5diff_23.txt
diff --git a/tools/testfiles/h5diff_24.txt b/tools/h5diff/testfiles/h5diff_24.txt
index 75f2e6f..75f2e6f 100644
--- a/tools/testfiles/h5diff_24.txt
+++ b/tools/h5diff/testfiles/h5diff_24.txt
diff --git a/tools/testfiles/h5diff_25.txt b/tools/h5diff/testfiles/h5diff_25.txt
index 8801c31..8801c31 100644
--- a/tools/testfiles/h5diff_25.txt
+++ b/tools/h5diff/testfiles/h5diff_25.txt
diff --git a/tools/testfiles/h5diff_26.txt b/tools/h5diff/testfiles/h5diff_26.txt
index 24e1190..24e1190 100644
--- a/tools/testfiles/h5diff_26.txt
+++ b/tools/h5diff/testfiles/h5diff_26.txt
diff --git a/tools/testfiles/h5diff_27.txt b/tools/h5diff/testfiles/h5diff_27.txt
index f62e0e3..f62e0e3 100644
--- a/tools/testfiles/h5diff_27.txt
+++ b/tools/h5diff/testfiles/h5diff_27.txt
diff --git a/tools/testfiles/h5diff_28.txt b/tools/h5diff/testfiles/h5diff_28.txt
index 4222159..4222159 100644
--- a/tools/testfiles/h5diff_28.txt
+++ b/tools/h5diff/testfiles/h5diff_28.txt
diff --git a/tools/testfiles/h5diff_50.txt b/tools/h5diff/testfiles/h5diff_50.txt
index d25dc1d..d25dc1d 100644
--- a/tools/testfiles/h5diff_50.txt
+++ b/tools/h5diff/testfiles/h5diff_50.txt
diff --git a/tools/testfiles/h5diff_51.txt b/tools/h5diff/testfiles/h5diff_51.txt
index cf20b90..cf20b90 100644
--- a/tools/testfiles/h5diff_51.txt
+++ b/tools/h5diff/testfiles/h5diff_51.txt
diff --git a/tools/testfiles/h5diff_52.txt b/tools/h5diff/testfiles/h5diff_52.txt
index 86e9463..86e9463 100644
--- a/tools/testfiles/h5diff_52.txt
+++ b/tools/h5diff/testfiles/h5diff_52.txt
diff --git a/tools/testfiles/h5diff_53.txt b/tools/h5diff/testfiles/h5diff_53.txt
index 2763fb3..2763fb3 100644
--- a/tools/testfiles/h5diff_53.txt
+++ b/tools/h5diff/testfiles/h5diff_53.txt
diff --git a/tools/testfiles/h5diff_54.txt b/tools/h5diff/testfiles/h5diff_54.txt
index 4c139de..4c139de 100644
--- a/tools/testfiles/h5diff_54.txt
+++ b/tools/h5diff/testfiles/h5diff_54.txt
diff --git a/tools/testfiles/h5diff_55.txt b/tools/h5diff/testfiles/h5diff_55.txt
index 2a1d496..2a1d496 100644
--- a/tools/testfiles/h5diff_55.txt
+++ b/tools/h5diff/testfiles/h5diff_55.txt
diff --git a/tools/testfiles/h5diff_56.txt b/tools/h5diff/testfiles/h5diff_56.txt
index 245d1a0..245d1a0 100644
--- a/tools/testfiles/h5diff_56.txt
+++ b/tools/h5diff/testfiles/h5diff_56.txt
diff --git a/tools/testfiles/h5diff_57.txt b/tools/h5diff/testfiles/h5diff_57.txt
index 2b22995..2b22995 100644
--- a/tools/testfiles/h5diff_57.txt
+++ b/tools/h5diff/testfiles/h5diff_57.txt
diff --git a/tools/testfiles/h5diff_58.txt b/tools/h5diff/testfiles/h5diff_58.txt
index b582c88..b582c88 100644
--- a/tools/testfiles/h5diff_58.txt
+++ b/tools/h5diff/testfiles/h5diff_58.txt
diff --git a/tools/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index 56cc052..56cc052 100644
--- a/tools/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
diff --git a/tools/testfiles/h5diff_602.txt b/tools/h5diff/testfiles/h5diff_602.txt
index cc522bd..cc522bd 100644
--- a/tools/testfiles/h5diff_602.txt
+++ b/tools/h5diff/testfiles/h5diff_602.txt
diff --git a/tools/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index 352e75e..352e75e 100644
--- a/tools/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
diff --git a/tools/testfiles/h5diff_604.txt b/tools/h5diff/testfiles/h5diff_604.txt
index dde3f37..dde3f37 100644
--- a/tools/testfiles/h5diff_604.txt
+++ b/tools/h5diff/testfiles/h5diff_604.txt
diff --git a/tools/testfiles/h5diff_605.txt b/tools/h5diff/testfiles/h5diff_605.txt
index 8047b46..8047b46 100644
--- a/tools/testfiles/h5diff_605.txt
+++ b/tools/h5diff/testfiles/h5diff_605.txt
diff --git a/tools/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index d1d83a1..d1d83a1 100644
--- a/tools/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
diff --git a/tools/testfiles/h5diff_607.txt b/tools/h5diff/testfiles/h5diff_607.txt
index 1a7c257..1a7c257 100644
--- a/tools/testfiles/h5diff_607.txt
+++ b/tools/h5diff/testfiles/h5diff_607.txt
diff --git a/tools/testfiles/h5diff_608.txt b/tools/h5diff/testfiles/h5diff_608.txt
index 49b490e..49b490e 100644
--- a/tools/testfiles/h5diff_608.txt
+++ b/tools/h5diff/testfiles/h5diff_608.txt
diff --git a/tools/testfiles/h5diff_609.txt b/tools/h5diff/testfiles/h5diff_609.txt
index 9a317f0..9a317f0 100644
--- a/tools/testfiles/h5diff_609.txt
+++ b/tools/h5diff/testfiles/h5diff_609.txt
diff --git a/tools/testfiles/h5diff_610.txt b/tools/h5diff/testfiles/h5diff_610.txt
index 1a7c257..1a7c257 100644
--- a/tools/testfiles/h5diff_610.txt
+++ b/tools/h5diff/testfiles/h5diff_610.txt
diff --git a/tools/testfiles/h5diff_611.txt b/tools/h5diff/testfiles/h5diff_611.txt
index 0b148a0..0b148a0 100644
--- a/tools/testfiles/h5diff_611.txt
+++ b/tools/h5diff/testfiles/h5diff_611.txt
diff --git a/tools/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 2aa4804..2aa4804 100644
--- a/tools/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
diff --git a/tools/testfiles/h5diff_613.txt b/tools/h5diff/testfiles/h5diff_613.txt
index dff7f7c..dff7f7c 100644
--- a/tools/testfiles/h5diff_613.txt
+++ b/tools/h5diff/testfiles/h5diff_613.txt
diff --git a/tools/testfiles/h5diff_614.txt b/tools/h5diff/testfiles/h5diff_614.txt
index 6090f4a..6090f4a 100644
--- a/tools/testfiles/h5diff_614.txt
+++ b/tools/h5diff/testfiles/h5diff_614.txt
diff --git a/tools/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index fe7f9a4..fe7f9a4 100644
--- a/tools/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
diff --git a/tools/testfiles/h5diff_616.txt b/tools/h5diff/testfiles/h5diff_616.txt
index 164aa15..164aa15 100644
--- a/tools/testfiles/h5diff_616.txt
+++ b/tools/h5diff/testfiles/h5diff_616.txt
diff --git a/tools/testfiles/h5diff_617.txt b/tools/h5diff/testfiles/h5diff_617.txt
index 3f0f078..3f0f078 100644
--- a/tools/testfiles/h5diff_617.txt
+++ b/tools/h5diff/testfiles/h5diff_617.txt
diff --git a/tools/testfiles/h5diff_618.txt b/tools/h5diff/testfiles/h5diff_618.txt
index a1bb5a6..a1bb5a6 100644
--- a/tools/testfiles/h5diff_618.txt
+++ b/tools/h5diff/testfiles/h5diff_618.txt
diff --git a/tools/testfiles/h5diff_619.txt b/tools/h5diff/testfiles/h5diff_619.txt
index f676315..f676315 100644
--- a/tools/testfiles/h5diff_619.txt
+++ b/tools/h5diff/testfiles/h5diff_619.txt
diff --git a/tools/testfiles/h5diff_620.txt b/tools/h5diff/testfiles/h5diff_620.txt
index 9221c76..9221c76 100644
--- a/tools/testfiles/h5diff_620.txt
+++ b/tools/h5diff/testfiles/h5diff_620.txt
diff --git a/tools/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index e27b486..e27b486 100644
--- a/tools/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
diff --git a/tools/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 4b6c1a1..4b6c1a1 100644
--- a/tools/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
diff --git a/tools/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index f4edf37..f4edf37 100644
--- a/tools/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
diff --git a/tools/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index babc43f..babc43f 100644
--- a/tools/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
diff --git a/tools/testfiles/h5diff_625.txt b/tools/h5diff/testfiles/h5diff_625.txt
index 2da804c..2da804c 100644
--- a/tools/testfiles/h5diff_625.txt
+++ b/tools/h5diff/testfiles/h5diff_625.txt
diff --git a/tools/testfiles/h5diff_626.txt b/tools/h5diff/testfiles/h5diff_626.txt
index 2a5fd2f..2a5fd2f 100644
--- a/tools/testfiles/h5diff_626.txt
+++ b/tools/h5diff/testfiles/h5diff_626.txt
diff --git a/tools/testfiles/h5diff_627.txt b/tools/h5diff/testfiles/h5diff_627.txt
index 95ad39a..95ad39a 100644
--- a/tools/testfiles/h5diff_627.txt
+++ b/tools/h5diff/testfiles/h5diff_627.txt
diff --git a/tools/testfiles/h5diff_628.txt b/tools/h5diff/testfiles/h5diff_628.txt
index d6fa229..d6fa229 100644
--- a/tools/testfiles/h5diff_628.txt
+++ b/tools/h5diff/testfiles/h5diff_628.txt
diff --git a/tools/testfiles/h5diff_629.txt b/tools/h5diff/testfiles/h5diff_629.txt
index 9f7632f..9f7632f 100644
--- a/tools/testfiles/h5diff_629.txt
+++ b/tools/h5diff/testfiles/h5diff_629.txt
diff --git a/tools/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt
index bc9efbe..bc9efbe 100644
--- a/tools/testfiles/h5diff_70.txt
+++ b/tools/h5diff/testfiles/h5diff_70.txt
diff --git a/tools/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt
index 9c0bd33..9c0bd33 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/h5diff/testfiles/h5diff_80.txt
diff --git a/tools/testfiles/h5diff_90.txt b/tools/h5diff/testfiles/h5diff_90.txt
index 4df38c0..4df38c0 100644
--- a/tools/testfiles/h5diff_90.txt
+++ b/tools/h5diff/testfiles/h5diff_90.txt
diff --git a/tools/testfiles/h5diff_attr1.h5 b/tools/h5diff/testfiles/h5diff_attr1.h5
index c44066b..c44066b 100644
--- a/tools/testfiles/h5diff_attr1.h5
+++ b/tools/h5diff/testfiles/h5diff_attr1.h5
diff --git a/tools/testfiles/h5diff_attr2.h5 b/tools/h5diff/testfiles/h5diff_attr2.h5
index 5de3303..5de3303 100644
--- a/tools/testfiles/h5diff_attr2.h5
+++ b/tools/h5diff/testfiles/h5diff_attr2.h5
diff --git a/tools/testfiles/h5diff_basic1.h5 b/tools/h5diff/testfiles/h5diff_basic1.h5
index 389e2b3..389e2b3 100644
--- a/tools/testfiles/h5diff_basic1.h5
+++ b/tools/h5diff/testfiles/h5diff_basic1.h5
diff --git a/tools/testfiles/h5diff_basic2.h5 b/tools/h5diff/testfiles/h5diff_basic2.h5
index ad45cc0..ad45cc0 100644
--- a/tools/testfiles/h5diff_basic2.h5
+++ b/tools/h5diff/testfiles/h5diff_basic2.h5
diff --git a/tools/testfiles/h5diff_dset1.h5 b/tools/h5diff/testfiles/h5diff_dset1.h5
index ab6b96f..ab6b96f 100644
--- a/tools/testfiles/h5diff_dset1.h5
+++ b/tools/h5diff/testfiles/h5diff_dset1.h5
diff --git a/tools/testfiles/h5diff_dset2.h5 b/tools/h5diff/testfiles/h5diff_dset2.h5
index 3db0c8e..3db0c8e 100644
--- a/tools/testfiles/h5diff_dset2.h5
+++ b/tools/h5diff/testfiles/h5diff_dset2.h5
diff --git a/tools/testfiles/h5diff_dtypes.h5 b/tools/h5diff/testfiles/h5diff_dtypes.h5
index 7c3cd9d..7c3cd9d 100644
--- a/tools/testfiles/h5diff_dtypes.h5
+++ b/tools/h5diff/testfiles/h5diff_dtypes.h5
diff --git a/tools/testfiles/h5diff_empty.h5 b/tools/h5diff/testfiles/h5diff_empty.h5
index 3f0d1df..3f0d1df 100644
--- a/tools/testfiles/h5diff_empty.h5
+++ b/tools/h5diff/testfiles/h5diff_empty.h5
diff --git a/tools/testfiles/h5diff_hyper1.h5 b/tools/h5diff/testfiles/h5diff_hyper1.h5
index ceeff80..ceeff80 100644
--- a/tools/testfiles/h5diff_hyper1.h5
+++ b/tools/h5diff/testfiles/h5diff_hyper1.h5
diff --git a/tools/testfiles/h5diff_hyper2.h5 b/tools/h5diff/testfiles/h5diff_hyper2.h5
index 05a2eb1..05a2eb1 100644
--- a/tools/testfiles/h5diff_hyper2.h5
+++ b/tools/h5diff/testfiles/h5diff_hyper2.h5
diff --git a/tools/testfiles/h5diff_types.h5 b/tools/h5diff/testfiles/h5diff_types.h5
index c835069..c835069 100644
--- a/tools/testfiles/h5diff_types.h5
+++ b/tools/h5diff/testfiles/h5diff_types.h5
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 6685a66..6e31feb 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -29,6 +29,7 @@
 ## test file names 
 ###############################################################################
 
+
 FILE1=h5diff_basic1.h5
 FILE2=h5diff_basic2.h5
 FILE3=h5diff_types.h5
@@ -56,7 +57,7 @@ if test -z "$srcdir"; then
    srcdir=.
 fi
 
-test -d ../testfiles || mkdir ../testfiles
+test -d ./testfiles || mkdir ./testfiles
 
 # Parse option
 #   -p   run ph5diff tests
@@ -171,9 +172,9 @@ STDERR_FILTER() {
 # that throws the shell script off.
 #
 TOOLTEST() {
-    expect="$srcdir/../testfiles/$1"
-    actual="../testfiles/`basename $1 .txt`.out"
-    actual_err="../testfiles/`basename $1 .txt`.err"
+    expect="$srcdir/testfiles/$1"
+    actual="./testfiles/`basename $1 .txt`.out"
+    actual_err="./testfiles/`basename $1 .txt`.err"
     actual_sav=${actual}-sav
     actual_err_sav=${actual_err}-sav
     shift
@@ -191,7 +192,7 @@ TOOLTEST() {
 	echo "#############################"
 	echo "Expected output for '$H5DIFF $@'" 
 	echo "#############################"
-	cd $srcdir/../testfiles
+	cd $srcdir/testfiles
 	if [ "`uname -s`" = "TFLOPS O/S" ]; then
 	    eval $RUNCMD $H5DIFF_BIN $@
 	else