[svn-r22600] Description:

    Bring r22251:22599 from trunk to revise_chunks branch.

Tested on:
    Mac OSX/64 10.7.4 (amazon) w/gcc 4.7.1, C++ & FORTRAN
    (Not h5committested yet, as this branch doesn't require it)

1 files changed, 25 insertions, 7 deletions

diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index 434cba7..49f977c 100644
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -165,21 +165,38 @@ main(void)
 
 #ifndef UNICOS
 
+#ifdef REBUILDTEXTFILES
  /*-------------------------------------------------------------------------
-  * TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
+  * TOOLTEST txtin8.txt -c $srcdir/testfiles/txtin8.conf -o txtin8.h5
   *-------------------------------------------------------------------------
   */
 
+    sp = HDfopen("txtin8.txt", "w");
+    for (k = 0; k < npln; k++)
+    {
+       for (i = 0; i < nrow; i++)
+       {
+           for (j = 0; j < ncol; j++)
+               (void) fprintf(sp, "%10u", b8i3[k][i][j]);
+           (void) fprintf(sp, "\n");
+       }
+    }
+    (void) HDfclose(sp);
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
+  *-------------------------------------------------------------------------
+  */
 
     sp = HDfopen("txtin16.txt", "w");
     for (k = 0; k < npln; k++)
     {
-        for (i = 0; i < nrow; i++)
-        {
-            for (j = 0; j < ncol; j++)
-                (void) fprintf(sp, "%10u", b16i3[k][i][j]);
-            (void) fprintf(sp, "\n");
-        }
+      for (i = 0; i < nrow; i++)
+      {
+          for (j = 0; j < ncol; j++)
+              (void) fprintf(sp, "%10u", b16i3[k][i][j]);
+          (void) fprintf(sp, "\n");
+      }
     }
     (void) HDfclose(sp);
 
@@ -199,6 +216,7 @@ main(void)
         }
     }
     (void) HDfclose(sp);
+#endif
 
  /*-------------------------------------------------------------------------
   * TOOLTEST binin32.bin -c $srcdir/testfiles/binin32.conf -o binin32.h5