From 64b3c0a9616a4266edb5129616b43810082dfb8b Mon Sep 17 00:00:00 2001
From: Pedro Vicente Nunes <pvn@hdfgroup.org>
Date: Thu, 25 Sep 2008 10:46:41 -0500
Subject: [svn-r15698] renamed input text files to have the extension .txt

tested: linux
---
 MANIFEST                              |  15 ++++++++-------
 tools/h5import/h5importtestutil.sh    |  16 ++++++++--------
 tools/h5import/testfiles/fp1          |   9 ---------
 tools/h5import/testfiles/fp1.txt      |   9 +++++++++
 tools/h5import/testfiles/fp2          |  19 -------------------
 tools/h5import/testfiles/fp2.txt      |  19 +++++++++++++++++++
 tools/h5import/testfiles/in1          |  15 ---------------
 tools/h5import/testfiles/in1.txt      |  15 +++++++++++++++
 tools/h5import/testfiles/in16.txt     |  15 +++++++++++++++
 tools/h5import/testfiles/in32.txt     |  15 +++++++++++++++
 tools/h5import/testfiles/str.txt      |   2 ++
 tools/h5import/testfiles/test14.h5    | Bin 0 -> 10240 bytes
 tools/h5import/testfiles/teststr.h5   | Bin 10240 -> 0 bytes
 tools/h5import/testfiles/textstr      |   6 ------
 tools/h5import/testfiles/textstr.conf |   6 ++++++
 tools/h5import/testfiles/txtstr       |   2 --
 16 files changed, 97 insertions(+), 66 deletions(-)
 delete mode 100755 tools/h5import/testfiles/fp1
 create mode 100755 tools/h5import/testfiles/fp1.txt
 delete mode 100755 tools/h5import/testfiles/fp2
 create mode 100755 tools/h5import/testfiles/fp2.txt
 delete mode 100755 tools/h5import/testfiles/in1
 create mode 100755 tools/h5import/testfiles/in1.txt
 create mode 100644 tools/h5import/testfiles/in16.txt
 create mode 100644 tools/h5import/testfiles/in32.txt
 create mode 100644 tools/h5import/testfiles/str.txt
 create mode 100644 tools/h5import/testfiles/test14.h5
 delete mode 100644 tools/h5import/testfiles/teststr.h5
 delete mode 100644 tools/h5import/testfiles/textstr
 create mode 100644 tools/h5import/testfiles/textstr.conf
 delete mode 100644 tools/h5import/testfiles/txtstr

diff --git a/MANIFEST b/MANIFEST
index 70d2bb7..d8ea26a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -924,9 +924,9 @@
 ./tools/h5import/testfiles/binin8.conf
 ./tools/h5import/testfiles/binuin16.conf
 ./tools/h5import/testfiles/binuin32.conf
-./tools/h5import/testfiles/fp1
-./tools/h5import/testfiles/fp2
-./tools/h5import/testfiles/in1
+./tools/h5import/testfiles/fp1.txt
+./tools/h5import/testfiles/fp2.txt
+./tools/h5import/testfiles/in1.txt
 ./tools/h5import/testfiles/textfp32.conf
 ./tools/h5import/testfiles/textfp64.conf
 ./tools/h5import/testfiles/textin16.conf
@@ -947,13 +947,14 @@
 ./tools/h5import/testfiles/test11.h5
 ./tools/h5import/testfiles/test12.h5
 ./tools/h5import/testfiles/test13.h5
-./tools/h5import/testfiles/teststr.h5
+./tools/h5import/testfiles/test14.h5
 ./tools/h5import/testfiles/test15.h5
-./tools/h5import/testfiles/teststr.h5
-./tools/h5import/testfiles/textstr
-./tools/h5import/testfiles/txtstr
+./tools/h5import/testfiles/textstr.conf
+./tools/h5import/testfiles/str.txt
 ./tools/h5import/testfiles/textpfe.conf
 ./tools/h5import/testfiles/in64.txt
+./tools/h5import/testfiles/in32.txt
+./tools/h5import/testfiles/in16.txt
 
 
 
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index f7defe9..759a660 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -60,25 +60,25 @@ cp $srcdir/testfiles/*.h5 tmp_testfiles/
 $RUNSERIAL ./h5importtest
 
 TESTING "ASCII I32 rank 3 - Output BE " ;
-TOOLTEST in32.txt -c $srcdir/testfiles/textin32.conf -o test1.h5
+TOOLTEST $srcdir/testfiles/in32.txt -c $srcdir/testfiles/textin32.conf -o test1.h5
 
 TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
-TOOLTEST in16.txt -c $srcdir/testfiles/textin16.conf -o test2.h5
+TOOLTEST $srcdir/testfiles/in16.txt -c $srcdir/testfiles/textin16.conf -o test2.h5
 
 TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed " 
-TOOLTEST in16.txt -c $srcdir/testfiles/textin8.conf  -o test3.h5
+TOOLTEST $srcdir/testfiles/in16.txt -c $srcdir/testfiles/textin8.conf  -o test3.h5
 
 TESTING "ASCII UI32 - rank 3 - Output BE" 
-TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin32.conf -o test4.h5
+TOOLTEST $srcdir/testfiles/in1.txt -c $srcdir/testfiles/textuin32.conf -o test4.h5
 
 TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
-TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin16.conf -o test5.h5
+TOOLTEST $srcdir/testfiles/in1.txt -c $srcdir/testfiles/textuin16.conf -o test5.h5
 
 TESTING "ASCII F32 - rank 3 - Output LE " 
-TOOLTEST $srcdir/testfiles/fp1 -c $srcdir/testfiles/textfp32.conf -o test6.h5
+TOOLTEST $srcdir/testfiles/fp1.txt -c $srcdir/testfiles/textfp32.conf -o test6.h5
 
 TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
-TOOLTEST $srcdir/testfiles/fp2 -c $srcdir/testfiles/textfp64.conf -o test7.h5
+TOOLTEST $srcdir/testfiles/fp2.txt -c $srcdir/testfiles/textfp64.conf -o test7.h5
 
 TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
 TOOLTEST bfp64 -c $srcdir/testfiles/binfp64.conf -o test8.h5
@@ -99,7 +99,7 @@ TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
 TOOLTEST buin32 -c $srcdir/testfiles/binuin32.conf -o test13.h5
 
 TESTING "STR" 
-TOOLTEST $srcdir/testfiles/txtstr -c $srcdir/testfiles/textstr -o teststr.h5
+TOOLTEST $srcdir/testfiles/str.txt -c $srcdir/testfiles/textstr.conf -o test14.h5
 
 TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE " 
 TOOLTEST $srcdir/testfiles/in64.txt -c $srcdir/testfiles/textpfe.conf -o test15.h5
diff --git a/tools/h5import/testfiles/fp1 b/tools/h5import/testfiles/fp1
deleted file mode 100755
index 142c94f..0000000
--- a/tools/h5import/testfiles/fp1
+++ /dev/null
@@ -1,9 +0,0 @@
-12.3 14.2 15.56
-26.782 27.22 28.44
-29.33 20.11 11.45
-22.31 23.3332 24.343
-
-16.134 19.34 0.17
-4.5 8.9 91.8
-34.7 0.32 0.076
-22.2 88.31 77.83
\ No newline at end of file
diff --git a/tools/h5import/testfiles/fp1.txt b/tools/h5import/testfiles/fp1.txt
new file mode 100755
index 0000000..142c94f
--- /dev/null
+++ b/tools/h5import/testfiles/fp1.txt
@@ -0,0 +1,9 @@
+12.3 14.2 15.56
+26.782 27.22 28.44
+29.33 20.11 11.45
+22.31 23.3332 24.343
+
+16.134 19.34 0.17
+4.5 8.9 91.8
+34.7 0.32 0.076
+22.2 88.31 77.83
\ No newline at end of file
diff --git a/tools/h5import/testfiles/fp2 b/tools/h5import/testfiles/fp2
deleted file mode 100755
index 6c83dc3..0000000
--- a/tools/h5import/testfiles/fp2
+++ /dev/null
@@ -1,19 +0,0 @@
-12.3 14.2 15.56
-26.782 27.22 28.44
-29.33 20.11 11.45
-22.31 23.3332 24.343
-
-16.134 19.34 0.17
-4.5 8.9 91.8
-34.7 0.32 0.076
-22.2 88.31 77.83
-
-216.134 139.34 101.17
-24.5 82.9 291.8  
-334.7 0.232 10.076 
-222.2 88.31 77.83
-
-122.3 114.2 125.56
-226.782 27.222 128.44
-341.7 30.132 0.1076
-4.51 181.9 911.8
diff --git a/tools/h5import/testfiles/fp2.txt b/tools/h5import/testfiles/fp2.txt
new file mode 100755
index 0000000..6c83dc3
--- /dev/null
+++ b/tools/h5import/testfiles/fp2.txt
@@ -0,0 +1,19 @@
+12.3 14.2 15.56
+26.782 27.22 28.44
+29.33 20.11 11.45
+22.31 23.3332 24.343
+
+16.134 19.34 0.17
+4.5 8.9 91.8
+34.7 0.32 0.076
+22.2 88.31 77.83
+
+216.134 139.34 101.17
+24.5 82.9 291.8  
+334.7 0.232 10.076 
+222.2 88.31 77.83
+
+122.3 114.2 125.56
+226.782 27.222 128.44
+341.7 30.132 0.1076
+4.51 181.9 911.8
diff --git a/tools/h5import/testfiles/in1 b/tools/h5import/testfiles/in1
deleted file mode 100755
index 0688e9b..0000000
--- a/tools/h5import/testfiles/in1
+++ /dev/null
@@ -1,15 +0,0 @@
-        83        85        87        89
-        84        86        88        90
-        85        87        89        91
-        88        90        92        94
-        89        91        93        95
-        90        92        94        96
-        93        95        97        99
-        94        96        98       100
-        95        97        99       101
-        98       100       102       104
-        99       101       103       105
-       100       102       104       106
-       103       105       107       109
-       104       106       108       110
-       105       107       109       111
diff --git a/tools/h5import/testfiles/in1.txt b/tools/h5import/testfiles/in1.txt
new file mode 100755
index 0000000..0688e9b
--- /dev/null
+++ b/tools/h5import/testfiles/in1.txt
@@ -0,0 +1,15 @@
+        83        85        87        89
+        84        86        88        90
+        85        87        89        91
+        88        90        92        94
+        89        91        93        95
+        90        92        94        96
+        93        95        97        99
+        94        96        98       100
+        95        97        99       101
+        98       100       102       104
+        99       101       103       105
+       100       102       104       106
+       103       105       107       109
+       104       106       108       110
+       105       107       109       111
diff --git a/tools/h5import/testfiles/in16.txt b/tools/h5import/testfiles/in16.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/h5import/testfiles/in16.txt
@@ -0,0 +1,15 @@
+        83        85        87        89
+        84        86        88        90
+        85        87        89        91
+        88        90        92        94
+        89        91        93        95
+        90        92        94        96
+        93        95        97        99
+        94        96        98       100
+        95        97        99       101
+        98       100       102       104
+        99       101       103       105
+       100       102       104       106
+       103       105       107       109
+       104       106       108       110
+       105       107       109       111
diff --git a/tools/h5import/testfiles/in32.txt b/tools/h5import/testfiles/in32.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/h5import/testfiles/in32.txt
@@ -0,0 +1,15 @@
+        83        85        87        89
+        84        86        88        90
+        85        87        89        91
+        88        90        92        94
+        89        91        93        95
+        90        92        94        96
+        93        95        97        99
+        94        96        98       100
+        95        97        99       101
+        98       100       102       104
+        99       101       103       105
+       100       102       104       106
+       103       105       107       109
+       104       106       108       110
+       105       107       109       111
diff --git a/tools/h5import/testfiles/str.txt b/tools/h5import/testfiles/str.txt
new file mode 100644
index 0000000..25be0a6
--- /dev/null
+++ b/tools/h5import/testfiles/str.txt
@@ -0,0 +1,2 @@
+ hello world
+ hello world again
diff --git a/tools/h5import/testfiles/test14.h5 b/tools/h5import/testfiles/test14.h5
new file mode 100644
index 0000000..ceb0810
Binary files /dev/null and b/tools/h5import/testfiles/test14.h5 differ
diff --git a/tools/h5import/testfiles/teststr.h5 b/tools/h5import/testfiles/teststr.h5
deleted file mode 100644
index ceb0810..0000000
Binary files a/tools/h5import/testfiles/teststr.h5 and /dev/null differ
diff --git a/tools/h5import/testfiles/textstr b/tools/h5import/testfiles/textstr
deleted file mode 100644
index 85079e0..0000000
--- a/tools/h5import/testfiles/textstr
+++ /dev/null
@@ -1,6 +0,0 @@
-PATH /mytext/data
-INPUT-CLASS STR
-
-
-
-
diff --git a/tools/h5import/testfiles/textstr.conf b/tools/h5import/testfiles/textstr.conf
new file mode 100644
index 0000000..85079e0
--- /dev/null
+++ b/tools/h5import/testfiles/textstr.conf
@@ -0,0 +1,6 @@
+PATH /mytext/data
+INPUT-CLASS STR
+
+
+
+
diff --git a/tools/h5import/testfiles/txtstr b/tools/h5import/testfiles/txtstr
deleted file mode 100644
index 25be0a6..0000000
--- a/tools/h5import/testfiles/txtstr
+++ /dev/null
@@ -1,2 +0,0 @@
- hello world
- hello world again
-- 
cgit v0.12