HDFFV-10219 - fix for native in bin file and possible non-native in h5

11 files changed, 156 insertions, 121 deletions

diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake
index 89685fa..009434f 100644
--- a/tools/test/h5import/CMakeTests.cmake
+++ b/tools/test/h5import/CMakeTests.cmake
@@ -17,13 +17,6 @@
 ##############################################################################
 
   set (HDF5_REFERENCE_CONF_FILES
-      binfp64.conf
-      binin8.conf
-      binin8w.conf
-      binin16.conf
-      binin32.conf
-      binuin16.conf
-      binuin32.conf
       txtfp32.conf
       txtfp64.conf
       txtin8.conf
@@ -75,6 +68,7 @@
   )
   set (HDF5_TOOLS_TEST_FILES
       tall.h5
+      tintsattrs.h5
   )
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
@@ -176,7 +170,7 @@
             NAME H5IMPORT-DUMP-${testname}-H5DMP
             COMMAND "${CMAKE_COMMAND}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-                -D "TEST_ARGS:STRING=-p;-d;${datasetname};-o;d${testfile}.bin;-b;testfiles/${testfile}"
+                -D "TEST_ARGS:STRING=-p;-d;${datasetname};-o;d${testfile}.bin;-b;FILE;testfiles/${testfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
                 -D "TEST_OUTPUT=d${testfile}.dmp"
                 -D "TEST_EXPECT=0"
@@ -489,12 +483,19 @@
       COMMAND    ${CMAKE_COMMAND}
           -E remove
           binfp64.bin
+          binfp64.conf
           binin8.bin
+          binin8.conf
           binin8w.bin
+          binin8w.conf
           binin16.bin
+          binin16.conf
           binin32.bin
+          binin32.conf
           binuin16.bin
+          binuin16.conf
           binuin32.bin
+          binuin32.conf
   )
   if (NOT "${last_test}" STREQUAL "")
     set_tests_properties (H5IMPORT-h5importtest-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -526,7 +527,7 @@
   ADD_H5_TEST (ASCII_F64 testfiles/txtfp64.txt testfiles/txtfp64.conf txtfp64.h5)
 
   # ----- TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
-  ADD_H5_TEST (BINARY_F64 binfp64.bin testfiles/binfp64.conf binfp64.h5)
+  ADD_H5_TEST (BINARY_F64 binfp64.bin binfp64.conf binfp64.h5)
   if (NOT USE_FILTER_DEFLATE)
     ADD_H5_SKIP_DUMPTEST (BINARY_F64 "/fp/bin/64-bit" binfp64.h5 BINARY)
   else ()
@@ -534,7 +535,7 @@
   endif ()
 
   # ----- TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
-  ADD_H5_TEST (BINARY_I8 binin8.bin testfiles/binin8.conf binin8.h5)
+  ADD_H5_TEST (BINARY_I8 binin8.bin binin8.conf binin8.h5)
   if (NOT USE_FILTER_DEFLATE)
     ADD_H5_SKIP_DUMPTEST (BINARY_I8 "/int/bin/8-bit" binin8.h5 BINARY)
   else ()
@@ -542,19 +543,19 @@
   endif ()
 
   # ----- TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
-  ADD_H5_TEST (BINARY_I16 binin16.bin testfiles/binin16.conf binin16.h5)
+  ADD_H5_TEST (BINARY_I16 binin16.bin binin16.conf binin16.h5)
   ADD_H5_DUMPTEST (BINARY_I16 "/int/bin/16-bit" binin16.h5 BINARY)
 
   # ----- TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
-  ADD_H5_TEST (BINARY_I32 binin32.bin testfiles/binin32.conf binin32.h5)
+  ADD_H5_TEST (BINARY_I32 binin32.bin binin32.conf binin32.h5)
   ADD_H5_DUMPTEST (BINARY_I32 "/int/bin/32-bit" binin32.h5 BINARY)
 
   # ----- TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
-  ADD_H5_TEST (BINARY_UI16 binuin16.bin testfiles/binuin16.conf binuin16.h5)
+  ADD_H5_TEST (BINARY_UI16 binuin16.bin binuin16.conf binuin16.h5)
   ADD_H5_DUMPTEST (BINARY_UI16 "/int/buin/16-bit" binuin16.h5 BINARY)
 
   # ----- TESTING "BINARY UI32 - rank 3 - Output LE "
-  ADD_H5_TEST (BINARY_UI32 binuin32.bin testfiles/binuin32.conf binuin32.h5)
+  ADD_H5_TEST (BINARY_UI32 binuin32.bin binuin32.conf binuin32.h5)
   ADD_H5_DUMPTEST (BINARY_UI32 "/int/buin/32-bit" binuin32.h5 BINARY)
 
   # ----- TESTING "STR"
@@ -562,7 +563,7 @@
   ADD_H5_DUMPTEST (STR "/mytext/data" txtstr.h5)
 
   # ----- TESTING "BINARY I8 CR LF EOF"
-  ADD_H5_TEST (BINARY_I8_EOF binin8w.bin testfiles/binin8w.conf binin8w.h5)
+  ADD_H5_TEST (BINARY_I8_EOF binin8w.bin binin8w.conf binin8w.h5)
   ADD_H5_DUMPTEST (BINARY_I8_EOF "/dataset0" binin8w.h5 BINARY)
 
   # ----- TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
@@ -571,4 +572,5 @@
   # ----- TESTING "Binary Subset "
   ADD_H5_DUMPSUBTEST (tall_fp32 tall.h5 /g2/dset2.2 --start=1,1 --stride=2,3 --count=1,2 --block=1,1)
   ADD_H5_DUMPSUBTEST (tall_i32 tall.h5 /g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1)
+  ADD_H5_DUMPSUBTEST (tintsattrs_u32 tintsattrs.h5 /DU32BITS --start=1,1 --stride=2,3 --count=3,2 --block=1,1)
 
diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c
index 135b8e4..00ae2e7 100644
--- a/tools/test/h5import/h5importtest.c
+++ b/tools/test/h5import/h5importtest.c
@@ -25,7 +25,7 @@
  *      h5importtest
  *
  * Description:
- *      This program creates that can be
+ *      This program creates files that can be
  *      used to test the h5import program.
  *
  */
@@ -36,6 +36,7 @@ main(void)
     int       nrow = 3, ncol = 4, npln = 5;
     int       i, j, k;
     FILE      *sp;
+    char      machine_order[3] = {0, 0, 0};
 
     float     row4[3], col4[4], pln4[5];
     float     rowo4 = 11.0F, colo4 = 21.0F, plno4 = 51.0F;
@@ -67,6 +68,14 @@ main(void)
     double    rowo8 = 11.0F, colo8 = 21.0F, plno8 = 51.0F;
     double    rowi8 = 1.0F, coli8 = 2.0F, plni8 = 5.0F;
 
+    /* Initialize machine endian */
+    volatile uint32_t ibyte=0x01234567;
+    /* 0 for big endian, 1 for little endian. */
+    if ((*((uint8_t*)(&ibyte))) == 0x67)
+        strncpy(machine_order, "LE", 2);
+    else
+        strncpy(machine_order, "BE", 2);
+
 
     /*
     * initialize the row, column, and plane vectors
@@ -217,7 +226,7 @@ main(void)
 #endif
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binin32.bin -c $srcdir/testfiles/binin32.conf -o binin32.h5
+  * TOOLTEST binin32.bin -c binin32.conf -o binin32.h5
   *-------------------------------------------------------------------------
   */
 
@@ -234,8 +243,21 @@ main(void)
     }
     (void) HDfclose(sp);
 
+    sp = HDfopen("binin32.conf", "w");
+    (void) fprintf(sp, "PATH /int/bin/32-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS IN\n");
+    (void) fprintf(sp, "INPUT-SIZE    32\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
+
  /*-------------------------------------------------------------------------
-  * TOOLTEST binuin32.bin -c $srcdir/testfiles/binuin32.conf -o binuin32.h5
+  * TOOLTEST binuin32.bin -c binuin32.conf -o binuin32.h5
   *-------------------------------------------------------------------------
   */
 
@@ -252,11 +274,20 @@ main(void)
     }
     (void) HDfclose(sp);
 
-
-
+    sp = HDfopen("binuin32.conf", "w");
+    (void) fprintf(sp, "PATH /int/buin/32-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS UIN\n");
+    (void) fprintf(sp, "INPUT-SIZE    32\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binin16.bin -c $srcdir/testfiles/binin16.conf -o binin16.h5
+  * TOOLTEST binin16.bin -c binin16.conf -o binin16.h5
   *-------------------------------------------------------------------------
   */
 
@@ -273,8 +304,22 @@ main(void)
     }
     (void) HDfclose(sp);
 
+    sp = HDfopen("binin16.conf", "w");
+    (void) fprintf(sp, "PATH /int/bin/16-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS IN\n");
+    (void) fprintf(sp, "INPUT-SIZE    16\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
+
  /*-------------------------------------------------------------------------
-  * TOOLTEST binuin16.bin -c $srcdir/testfiles/binuin16.conf -o binuin16.h5
+  * TOOLTEST binuin16.bin -c binuin16.conf -o binuin16.h5
   *-------------------------------------------------------------------------
   */
     sp = HDfopen("binuin16.bin", OPEN_FLAGS);
@@ -290,10 +335,22 @@ main(void)
     }
     (void) HDfclose(sp);
 
-
+    sp = HDfopen("binuin16.conf", "w");
+    (void) fprintf(sp, "PATH /int/buin/16-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS UIN\n");
+    (void) fprintf(sp, "INPUT-SIZE    16\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binin8.bin -c $srcdir/testfiles/binin8.conf  -o binin8.h5
+  * TOOLTEST binin8.bin -c binin8.conf  -o binin8.h5
   *-------------------------------------------------------------------------
   */
 
@@ -310,13 +367,27 @@ main(void)
     }
     (void) HDfclose(sp);
 
-#endif /* UNICOS */
-
-
+    sp = HDfopen("binin8.conf", "w");
+    (void) fprintf(sp, "PATH /int/bin/8-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS IN\n");
+    (void) fprintf(sp, "INPUT-SIZE    8\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-CLASS IN\n");
+    (void) fprintf(sp, "OUTPUT-SIZE    16\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n");
+    (void) fprintf(sp, "COMPRESSION-PARAM 3\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
 
+#endif /* UNICOS */
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binfp64.bin -c $srcdir/testfiles/binfp64.conf -o binfp64.h5
+  * TOOLTEST binfp64.bin -c binfp64.conf -o binfp64.h5
   *-------------------------------------------------------------------------
   */
 
@@ -337,10 +408,23 @@ main(void)
     }
     (void) HDfclose(sp);
 
-
+    sp = HDfopen("binfp64.conf", "w");
+    (void) fprintf(sp, "PATH /fp/bin/64-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS FP\n");
+    (void) fprintf(sp, "INPUT-SIZE    64\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n");
+    (void) fprintf(sp, "COMPRESSION-PARAM 8\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binin8w.bin -c $srcdir/testfiles/binin8w.conf -o binin8w.h5
+  * TOOLTEST binin8w.bin -c binin8w.conf -o binin8w.h5
   *-------------------------------------------------------------------------
   */
 
@@ -357,13 +441,20 @@ main(void)
         }
         HDfclose(sp);
 
+        sp = HDfopen("binin8w.conf", "w");
+        (void) fprintf(sp, "INPUT-CLASS IN\n");
+        (void) fprintf(sp, "INPUT-SIZE    8\n");
+        (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+        (void) fprintf(sp, "RANK 1\n");
+        (void) fprintf(sp, "OUTPUT-CLASS IN\n");
+        (void) fprintf(sp, "OUTPUT-SIZE    8\n");
+        (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+        (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+        (void) fprintf(sp, "DIMENSION-SIZES 4\n");
+        (void) fprintf(sp, "\n");
+        (void) HDfclose(sp);
 
     }
-
-
-
-
-
     return (EXIT_SUCCESS);
 }
 
diff --git a/tools/test/h5import/testfiles/binfp64.conf b/tools/test/h5import/testfiles/binfp64.conf
deleted file mode 100644
index 6b4c361..0000000
--- a/tools/test/h5import/testfiles/binfp64.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-PATH /fp/bin/64-bit
-INPUT-CLASS FP
-INPUT-SIZE	64
-RANK 3
-DIMENSION-SIZES 5 3 4
-OUTPUT-ARCHITECTURE IEEE
-OUTPUT-BYTE-ORDER LE
-CHUNKED-DIMENSION-SIZES 2 2 2
-COMPRESSION-PARAM 8
-MAXIMUM-DIMENSIONS -1 6 7
-
-
-
diff --git a/tools/test/h5import/testfiles/binin16.conf b/tools/test/h5import/testfiles/binin16.conf
deleted file mode 100644
index 06869cb..0000000
--- a/tools/test/h5import/testfiles/binin16.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-PATH /int/bin/16-bit
-INPUT-CLASS IN
-INPUT-SIZE	16
-RANK 3
-DIMENSION-SIZES 2 3 4
-CHUNKED-DIMENSION-SIZES 2 2 2
-MAXIMUM-DIMENSIONS -1 -1 8
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER LE
-
-
-
diff --git a/tools/test/h5import/testfiles/binin32.conf b/tools/test/h5import/testfiles/binin32.conf
deleted file mode 100644
index 11996ef..0000000
--- a/tools/test/h5import/testfiles/binin32.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-PATH /int/bin/32-bit
-INPUT-CLASS IN
-INPUT-SIZE	32
-RANK 3
-DIMENSION-SIZES 5 3 4
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER BE
-CHUNKED-DIMENSION-SIZES 1 2 1
-
-
-
-
diff --git a/tools/test/h5import/testfiles/binin32.h5 b/tools/test/h5import/testfiles/binin32.h5
index fd8faa9..2ec5b7c 100644
--- a/tools/test/h5import/testfiles/binin32.h5
+++ b/tools/test/h5import/testfiles/binin32.h5
diff --git a/tools/test/h5import/testfiles/binin8.conf b/tools/test/h5import/testfiles/binin8.conf
deleted file mode 100644
index 1edd80a..0000000
--- a/tools/test/h5import/testfiles/binin8.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-PATH /int/bin/8-bit
-INPUT-CLASS IN
-INPUT-SIZE	8
-OUTPUT-CLASS IN
-OUTPUT-SIZE 16
-RANK 3
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER LE
-DIMENSION-SIZES 5 3 4
-CHUNKED-DIMENSION-SIZES 2 2 2
-MAXIMUM-DIMENSIONS -1 -1 -1
-COMPRESSION-PARAM 3
-
-
-
-
diff --git a/tools/test/h5import/testfiles/binin8w.conf b/tools/test/h5import/testfiles/binin8w.conf
deleted file mode 100644
index fccb4ac..0000000
--- a/tools/test/h5import/testfiles/binin8w.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-INPUT-CLASS IN
-INPUT-SIZE  8
-RANK 1
-DIMENSION-SIZES 4
-OUTPUT-BYTE-ORDER LE
-OUTPUT-CLASS IN
-OUTPUT-SIZE 8
-OUTPUT-ARCHITECTURE STD
diff --git a/tools/test/h5import/testfiles/binuin16.conf b/tools/test/h5import/testfiles/binuin16.conf
deleted file mode 100644
index a4603df..0000000
--- a/tools/test/h5import/testfiles/binuin16.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-PATH /int/buin/16-bit
-INPUT-CLASS UIN
-INPUT-SIZE	16
-RANK 3
-DIMENSION-SIZES 2 3 4
-CHUNKED-DIMENSION-SIZES 2 2 2
-MAXIMUM-DIMENSIONS -1 -1 8
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER BE
-
-
-
diff --git a/tools/test/h5import/testfiles/binuin32.conf b/tools/test/h5import/testfiles/binuin32.conf
deleted file mode 100644
index a649e97..0000000
--- a/tools/test/h5import/testfiles/binuin32.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-PATH /int/buin/32-bit
-INPUT-CLASS UIN
-INPUT-SIZE	32
-RANK 3
-DIMENSION-SIZES 5 3 4
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER LE
-
-
-
-
-
diff --git a/tools/test/h5import/testfiles/tintsattrs_u32.ddl b/tools/test/h5import/testfiles/tintsattrs_u32.ddl
new file mode 100644
index 0000000..cf8889c
--- /dev/null
+++ b/tools/test/h5import/testfiles/tintsattrs_u32.ddl
@@ -0,0 +1,28 @@
+HDF5 "d-tintsattrs_u32.h5" {
+GROUP "/" {
+   DATASET "DU32BITS" {
+      DATATYPE  H5T_STD_U32LE
+      DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 24
+         OFFSET 2048
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+      DATA {
+      (0,0): 4294967292, 4294967264,
+      (1,0): 4294967280, 4294967168,
+      (2,0): 4294967232, 4294966784
+      }
+   }
+}
+}