[svn-r14532] removed commented unused code

tested: linux

2 files changed, 1 insertions, 66 deletions

diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index 8cb8377..9272632 100755
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -391,54 +391,6 @@ main(void)
 
 
 
-#if defined (NOT_USED)
-
-#ifndef WIN32
-
-    sp = fopen("bin64-2", "w");
-    for (i = 0; i < nrow; i++)
-    {
-        for (j = 0; j < ncol; j++)
-        {
-            (void) fwrite((char *) &b64i2[i][j], sizeof(long_long), 1, sp);
-        }
-    }
-    (void) fclose(sp);
-#endif
-
-    sp = fopen("bfp32", "w");
-    for (k = 0; k < npln; k++)
-    {
-        for (i = 0; i < nrow; i++)
-        {
-            for (j = 0; j < ncol; j++)
-            {
-                (void) fwrite((char *) &b32r3[k][i][j],sizeof(float), 1, sp);
-            }
-        }
-    }
-    (void) fclose(sp);
-
-
-
-#ifndef WIN32
-
-    sp = fopen("bin64-3", "w");
-    for (k = 0; k < npln; k++)
-    {
-        for (i = 0; i < nrow; i++)
-        {
-            for (j = 0; j < ncol; j++)
-            {
-                (void) fwrite((char *) &b64i3[k][i][j], sizeof(long_long), 1, sp);
-            }
-        }
-    }
-    (void) fclose(sp);
-#endif
-
-#endif /* NOT_USED */
-
 
 
     return (0);
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index 9b84622..13cca76 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -61,65 +61,48 @@ cp $srcdir/testfiles/*.h5 tmp_testfiles/
 $RUNSERIAL ./h5importtest
 
 TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
-#TOOLTEST txtin16 -c $srcdir/testfiles/textin16 -o test2.h5
 TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
 
 TESTING "ASCII I32 rank 3 - Output BE " ;
-#TOOLTEST txtin32 -c $srcdir/testfiles/textin32 -o test1.h5
-#TOOLTEST txtin32.txt -c $srcdir/testfiles/textin32.conf -o textin32.h5
 TOOLTEST txtin32.txt -c $srcdir/testfiles/txtin32.conf -o txtin32.h5
 
 TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed " 
-#TOOLTEST txtin16 -c $srcdir/testfiles/textin8  -o test3.h5
-#TOOLTEST txtin16.txt -c $srcdir/testfiles/textin8.conf  -o textin8.h5
 TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin8.conf  -o txtin8.h5
 
 TESTING "ASCII UI32 - rank 3 - Output BE" 
-#TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin32 -o test4.h5
 TOOLTEST $srcdir/testfiles/txtuin32.txt -c $srcdir/testfiles/txtuin32.conf -o txtuin32.h5
 
 TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
-#TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin16 -o test5.h5
 TOOLTEST $srcdir/testfiles/txtuin32.txt -c $srcdir/testfiles/txtuin16.conf -o txtuin16.h5
 
 TESTING "ASCII F32 - rank 3 - Output LE " 
-#TOOLTEST $srcdir/testfiles/fp1 -c $srcdir/testfiles/textfp32 -o test6.h5
 TOOLTEST $srcdir/testfiles/txtfp32.txt -c $srcdir/testfiles/txtfp32.conf -o txtfp32.h5
 
 TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
-#TOOLTEST $srcdir/testfiles/fp2 -c $srcdir/testfiles/textfp64 -o test7.h5
 TOOLTEST $srcdir/testfiles/txtfp64.txt -c $srcdir/testfiles/txtfp64.conf -o txtfp64.h5
 
 TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
-#TOOLTEST bfp64 -c $srcdir/testfiles/conbfp64 -o test8.h5
 TOOLTEST binfp64.bin -c $srcdir/testfiles/binfp64.conf -o binfp64.h5
 
 TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
-#TOOLTEST bin16 -c $srcdir/testfiles/conbin16 -o test9.h5
 TOOLTEST binin16.bin -c $srcdir/testfiles/binin16.conf -o binin16.h5
 
 TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
-#TOOLTEST bin8 -c $srcdir/testfiles/conbin8  -o test10.h5
 TOOLTEST binin8.bin -c $srcdir/testfiles/binin8.conf  -o binin8.h5
 
 TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED " 
-#TOOLTEST bin32 -c $srcdir/testfiles/conbin32 -o test11.h5
 TOOLTEST binin32.bin -c $srcdir/testfiles/binin32.conf -o binin32.h5
 
 TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
-#TOOLTEST buin16 -c $srcdir/testfiles/conbuin16 -o test12.h5
 TOOLTEST binuin16.bin -c $srcdir/testfiles/binuin16.conf -o binuin16.h5
 
 TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED " 
-#TOOLTEST buin32 -c $srcdir/testfiles/conbuin32 -o test13.h5
 TOOLTEST binuin32.bin -c $srcdir/testfiles/binuin32.conf -o binuin32.h5
 
 TESTING "BINARY I8 CR LF EOF" 
-#TOOLTEST bin8w.bin -c $srcdir/testfiles/bin8w.conf -o bin8w.h5
 TOOLTEST binin8w.bin -c $srcdir/testfiles/binin8w.conf -o binin8w.h5
 
-rm -f  tx* b* *.dat
-rm -f  *.h5
+rm -f  *.txt *.bin *.h5
 rm -rf tmp_testfiles
 else
 	echo "** h5import or h5importtest not available ***"