Split tools into src and test - add folders

54 files changed, 1592 insertions, 0 deletions

diff --git a/tools/test/h5import/CMakeLists.txt b/tools/test/h5import/CMakeLists.txt
new file mode 100644
index 0000000..22491b4
--- /dev/null
+++ b/tools/test/h5import/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required (VERSION 3.1.0)
+PROJECT (HDF5_TOOLS_TEST_H5IMPORT)
+
+#-----------------------------------------------------------------------------
+# Setup include Directories
+#-----------------------------------------------------------------------------
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
+
+  # --------------------------------------------------------------------
+  # Add the h5import executables
+  # --------------------------------------------------------------------
+  add_executable (h5importtest ${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/h5importtest.c)
+  TARGET_NAMING (h5importtest STATIC)
+  TARGET_C_PROPERTIES (h5importtest STATIC " " " ")
+  target_link_libraries (h5importtest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+  set_target_properties (h5importtest PROPERTIES FOLDER tools)
+
+  include (CMakeTests.cmake)
diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake
new file mode 100644
index 0000000..eb0b413
--- /dev/null
+++ b/tools/test/h5import/CMakeTests.cmake
@@ -0,0 +1,465 @@
+
+##############################################################################
+##############################################################################
+###           T E S T I N G                                                ###
+##############################################################################
+##############################################################################
+
+  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
+      txtin16.conf
+      txtin32.conf
+      txtuin16.conf
+      txtuin32.conf
+      textpfe.conf
+      txtstr.conf
+  )
+  set (HDF5_REFERENCE_TXT_FILES
+      txtfp32.txt
+      txtfp64.txt
+      txtuin16.txt
+      txtuin32.txt
+      txtin8.txt
+      txtin16.txt
+      txtin32.txt
+      textpfe64.txt
+      txtstr.txt
+      dbinfp64.h5.txt
+      dbinin8.h5.txt
+      dbinin8w.h5.txt
+      dbinin16.h5.txt
+      dbinin32.h5.txt
+      dbinuin16.h5.txt
+      dbinuin32.h5.txt
+      dtxtstr.h5.txt
+  )
+  set (HDF5_REFERENCE_TEST_FILES
+      binfp64.h5
+      binin8.h5
+      binin8w.h5
+      binin16.h5
+      binin32.h5
+      binuin16.h5
+      binuin32.h5
+      txtfp32.h5
+      txtfp64.h5
+      txtin8.h5
+      txtin16.h5
+      txtin32.h5
+      txtuin16.h5
+      txtuin32.h5
+      txtstr.h5
+      textpfe.h5
+  )
+
+  file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+  foreach (conf_file ${HDF5_REFERENCE_CONF_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files")
+  endforeach (conf_file ${HDF5_REFERENCE_CONF_FILES})
+
+  foreach (txt_file ${HDF5_REFERENCE_TXT_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files")
+  endforeach (txt_file ${HDF5_REFERENCE_TXT_FILES})
+
+  foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
+  endforeach (h5_file ${HDF5_REFERENCE_TEST_FILES})
+  add_custom_target(h5import_files ALL COMMENT "Copying files needed by h5import tests" DEPENDS ${h5import_files_list})
+
+##############################################################################
+##############################################################################
+###           T H E   T E S T S  M A C R O S                               ###
+##############################################################################
+##############################################################################
+  MACRO (ADD_H5_TEST testname importfile conffile testfile)
+    # If using memchecker skip macro based tests
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME H5IMPORT-${testname} COMMAND $<TARGET_FILE:h5import> ${importfile} -c ${conffile} -o ${testfile})
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-h5importtest)
+      endif ()
+    else (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5IMPORT-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${testfile}
+      )
+      set_tests_properties (H5IMPORT-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
+
+      add_test (NAME H5IMPORT-${testname} COMMAND $<TARGET_FILE:h5import> ${importfile} -c ${conffile} -o ${testfile})
+      set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-${testname}-clear-objects)
+
+      add_test (
+          NAME H5IMPORT-${testname}-H5DMP
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+              -D "TEST_ARGS:STRING=${testfile}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=${testfile}.new"
+              -D "TEST_EXPECT=0"
+              -D "TEST_FILTER=(^(HDF5)[^\n]*)"
+              -D "TEST_SKIP_COMPARE=TRUE"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5IMPORT-${testname}-H5DMP PROPERTIES DEPENDS H5IMPORT-${testname})
+      add_test (
+          NAME H5IMPORT-${testname}-H5DMP_CMP
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+              -D "TEST_ARGS:STRING=testfiles/${testfile}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=${testfile}.out"
+              -D "TEST_EXPECT=0"
+              -D "TEST_FILTER=(^(HDF5)[^\n]*)"
+              -D "TEST_REFERENCE=${testfile}.new"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5IMPORT-${testname}-H5DMP_CMP PROPERTIES DEPENDS H5IMPORT-${testname}-H5DMP)
+    endif (HDF5_ENABLE_USING_MEMCHECKER)
+  ENDMACRO (ADD_H5_TEST testname importfile conffile testfile)
+
+  MACRO (ADD_H5_DUMPTEST testname datasetname testfile)
+    # If using memchecker skip tests
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5IMPORT-DUMP-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              d${testfile}
+              d${testfile}.bin
+      )
+      set_tests_properties (H5IMPORT-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
+
+      if ("${ARGN}" STREQUAL "BINARY")
+        add_test (
+            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_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=d${testfile}.dmp"
+                -D "TEST_EXPECT=0"
+                -D "TEST_SKIP_COMPARE=TRUE"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      else ("${ARGN}" STREQUAL "BINARY")
+        add_test (
+            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;-y;--width=1;testfiles/${testfile}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=d${testfile}.dmp"
+                -D "TEST_EXPECT=0"
+                -D "TEST_SKIP_COMPARE=TRUE"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ("${ARGN}" STREQUAL "BINARY")
+      set_tests_properties (H5IMPORT-DUMP-${testname}-H5DMP PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}-clear-objects")
+
+      add_test (
+          NAME H5IMPORT-DUMP-${testname}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5import>"
+              -D "TEST_ARGS:STRING=d${testfile}.bin;-c;d${testfile}.dmp;-o;d${testfile}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=d${testfile}.imp"
+              -D "TEST_EXPECT=0"
+              -D "TEST_SKIP_COMPARE=TRUE"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5IMPORT-DUMP-${testname} PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}-H5DMP")
+
+      add_test (
+          NAME H5IMPORT-DUMP-${testname}-H5DFF
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5diff>"
+              -D "TEST_ARGS:STRING=-r;d${testfile};testfiles/${testfile};${datasetname};${datasetname}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=d${testfile}.dff"
+              -D "TEST_EXPECT=0"
+              -D "TEST_FILTER=(^(Warning)[^\n]*)"
+              -D "TEST_REFERENCE=testfiles/d${testfile}.txt"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5IMPORT-DUMP-${testname}-H5DFF PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}")
+    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+  ENDMACRO (ADD_H5_DUMPTEST testname datasetname testfile)
+
+  MACRO (ADD_H5_SKIP_DUMPTEST testname datasetname testfile)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5IMPORT-DUMP-${testname}-SKIPPED
+          COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${testname} ${datasetname} ${testfile} --- DEFLATE filter not available"
+      )
+    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+  ENDMACRO (ADD_H5_SKIP_DUMPTEST testname datasetname testfile)
+
+  # --------------------------------------------------------------------
+  # Determine if filter is available for h5diff
+  # --------------------------------------------------------------------
+  if (H5_HAVE_FILTER_DEFLATE)
+    set (USE_FILTER_DEFLATE "true")
+  endif (H5_HAVE_FILTER_DEFLATE)
+
+##############################################################################
+##############################################################################
+###           T H E   T E S T S                                            ###
+##############################################################################
+##############################################################################
+
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    # Remove any output file left over from previous test run
+    add_test (
+        NAME H5IMPORT-clear-objects
+        COMMAND    ${CMAKE_COMMAND}
+            -E remove
+            binfp64.bin
+            binin8.bin
+            binin8w.bin
+            binin16.bin
+            binin32.bin
+            binuin16.bin
+            binuin32.bin
+            txtin32.h5
+            txtin32.h5.new
+            txtin32.h5.new.err
+            txtin32.h5.out
+            txtin32.h5.out.err
+            txtin16.h5
+            txtin16.h5.new
+            txtin16.h5.new.err
+            txtin16.h5.out
+            txtin16.h5.out.err
+            txtin8.h5
+            txtin8.h5.new
+            txtin8.h5.new.err
+            txtin8.h5.out
+            txtin8.h5.out.err
+            txtuin16.h5
+            txtuin16.h5.new
+            txtuin16.h5.new.err
+            txtuin16.h5.out
+            txtuin16.h5.out.err
+            txtuin32.h5
+            txtuin32.h5.new
+            txtuin32.h5.new.err
+            txtuin32.h5.out
+            txtuin32.h5.out.err
+            txtfp32.h5
+            txtfp32.h5.new
+            txtfp32.h5.new.err
+            txtfp32.h5.out
+            txtfp32.h5.out.err
+            txtfp64.h5
+            txtfp64.h5.new
+            txtfp64.h5.new.err
+            txtfp64.h5.out
+            txtfp64.h5.out.err
+            binfp64.h5
+            binfp64.h5.new
+            binfp64.h5.new.err
+            binfp64.h5.out
+            binfp64.h5.out.err
+            binin8.h5
+            binin8.h5.new
+            binin8.h5.new.err
+            binin8.h5.out
+            binin8.h5.out.err
+            binin8w.h5
+            binin8w.h5.new
+            binin8w.h5.new.err
+            binin8w.h5.out
+            binin8w.h5.out.err
+            binin16.h5
+            binin16.h5.new
+            binin16.h5.new.err
+            binin16.h5.out
+            binin16.h5.out.err
+            binin32.h5
+            binin32.h5.new
+            binin32.h5.new.err
+            binin32.h5.out
+            binin32.h5.out.err
+            binuin16.h5
+            binuin16.h5.new
+            binuin16.h5.new.err
+            binuin16.h5.out
+            binuin16.h5.out.err
+            binuin32.h5
+            binuin32.h5.new
+            binuin32.h5.new.err
+            binuin32.h5.out
+            binuin32.h5.out.err
+            txtstr.h5
+            txtstr.h5.new
+            txtstr.h5.new.err
+            txtstr.h5.out
+            txtstr.h5.out.err
+            textpfe.h5
+            textpfe.h5.new
+            textpfe.h5.new.err
+            textpfe.h5.out
+            textpfe.h5.out.err
+            dbinfp64.h5
+            dbinfp64.h5.bin
+            dbinfp64.h5.imp
+            dbinfp64.h5.imp.err
+            dbinfp64.h5.dmp
+            dbinfp64.h5.dmp.err
+            dbinfp64.h5.dff
+            dbinfp64.h5.dff.err
+            dbinin8.h5
+            dbinin8.h5.bin
+            dbinin8.h5.imp
+            dbinin8.h5.imp.err
+            dbinin8.h5.dmp
+            dbinin8.h5.dmp.err
+            dbinin8.h5.dff
+            dbinin8.h5.dff.err
+            dbinin8w.h5
+            dbinin8w.h5.bin
+            dbinin8w.h5.imp
+            dbinin8w.h5.imp.err
+            dbinin8w.h5.dmp
+            dbinin8w.h5.dmp.err
+            dbinin8w.h5.dff
+            dbinin8w.h5.dff.err
+            dbinin16.h5
+            dbinin16.h5.bin
+            dbinin16.h5.imp
+            dbinin16.h5.imp.err
+            dbinin16.h5.dmp
+            dbinin16.h5.dmp.err
+            dbinin16.h5.dff
+            dbinin16.h5.dff.err
+            dbinin32.h5
+            dbinin32.h5.bin
+            dbinin32.h5.imp
+            dbinin32.h5.imp.err
+            dbinin32.h5.dmp
+            dbinin32.h5.dmp.err
+            dbinin32.h5.dff
+            dbinin32.h5.dff.err
+            dbinuin16.h5
+            dbinuin16.h5.bin
+            dbinuin16.h5.imp
+            dbinuin16.h5.imp.err
+            dbinuin16.h5.dmp
+            dbinuin16.h5.dmp.err
+            dbinuin16.h5.dff
+            dbinuin16.h5.dff.err
+            dbinuin32.h5
+            dbinuin32.h5.bin
+            dbinuin32.h5.imp
+            dbinuin32.h5.imp.err
+            dbinuin32.h5.dmp
+            dbinuin32.h5.dmp.err
+            dbinuin32.h5.dff
+            dbinuin32.h5.dff.err
+            dtxtstr.h5
+            dtxtstr.h5.bin
+            dtxtstr.h5.imp
+            dtxtstr.h5.imp.err
+            dtxtstr.h5.dmp
+            dtxtstr.h5.dmp.err
+            dtxtstr.h5.dff
+            dtxtstr.h5.dff.err
+    )
+    set (last_test "H5IMPORT-clear-objects")
+  endif (HDF5_ENABLE_USING_MEMCHECKER)
+
+  add_test (
+      NAME H5IMPORT-h5importtest-clear-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove
+          binfp64.bin
+          binin8.bin
+          binin8w.bin
+          binin16.bin
+          binin32.bin
+          binuin16.bin
+          binuin32.bin
+  )
+  if (NOT "${last_test}" STREQUAL "")
+    set_tests_properties (H5IMPORT-h5importtest-clear-objects PROPERTIES DEPENDS ${last_test})
+  endif (NOT "${last_test}" STREQUAL "")
+  set (last_test "H5IMPORT-clear-objects")
+
+  add_test (NAME H5IMPORT-h5importtest COMMAND $<TARGET_FILE:h5importtest>)
+  set_tests_properties (H5IMPORT-h5importtest PROPERTIES DEPENDS H5IMPORT-h5importtest-clear-objects)
+
+  # ----- TESTING "ASCII I32 rank 3 - Output BE " ;
+  ADD_H5_TEST (ASCII_I32 testfiles/txtin32.txt testfiles/txtin32.conf txtin32.h5)
+
+  # ----- TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
+  ADD_H5_TEST (ASCII_I16 testfiles/txtin16.txt testfiles/txtin16.conf txtin16.h5)
+
+  # ----- TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed "
+  ADD_H5_TEST (ASCII_I8 testfiles/txtin8.txt testfiles/txtin8.conf txtin8.h5)
+
+  # ----- TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
+  ADD_H5_TEST (ASCII_UI16 testfiles/txtuin16.txt testfiles/txtuin16.conf txtuin16.h5)
+
+  # ----- TESTING "ASCII UI32 - rank 3 - Output BE"
+  ADD_H5_TEST (ASCII_UI32 testfiles/txtuin32.txt testfiles/txtuin32.conf txtuin32.h5)
+
+  # ----- TESTING "ASCII F32 - rank 3 - Output LE "
+  ADD_H5_TEST (ASCII_F32 testfiles/txtfp32.txt testfiles/txtfp32.conf txtfp32.h5)
+
+  # ----- TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
+  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)
+  if (NOT USE_FILTER_DEFLATE)
+    ADD_H5_SKIP_DUMPTEST (BINARY_F64 "/fp/bin/64-bit" binfp64.h5 BINARY)
+  else (NOT USE_FILTER_DEFLATE)
+    ADD_H5_DUMPTEST (BINARY_F64 "/fp/bin/64-bit" binfp64.h5 BINARY)
+  endif (NOT USE_FILTER_DEFLATE)
+
+  # ----- TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
+  ADD_H5_TEST (BINARY_I8 binin8.bin testfiles/binin8.conf binin8.h5)
+  if (NOT USE_FILTER_DEFLATE)
+    ADD_H5_SKIP_DUMPTEST (BINARY_I8 "/int/bin/8-bit" binin8.h5 BINARY)
+  else (NOT USE_FILTER_DEFLATE)
+    ADD_H5_DUMPTEST (BINARY_I8 "/int/bin/8-bit" binin8.h5 BINARY)
+  endif (NOT USE_FILTER_DEFLATE)
+
+  # ----- TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
+  ADD_H5_TEST (BINARY_I16 binin16.bin testfiles/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_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_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_DUMPTEST (BINARY_UI32 "/int/buin/32-bit" binuin32.h5 BINARY)
+
+  # ----- TESTING "STR"
+  ADD_H5_TEST (STR testfiles/txtstr.txt testfiles/txtstr.conf txtstr.h5)
+  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_DUMPTEST (BINARY_I8_EOF "/dataset0" binin8w.h5 BINARY)
+
+  # ----- TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
+  ADD_H5_TEST (ASCII_F64_R1 testfiles/textpfe64.txt testfiles/textpfe.conf textpfe.h5)
+
diff --git a/tools/test/h5import/Makefile.am b/tools/test/h5import/Makefile.am
new file mode 100644
index 0000000..f238f77
--- /dev/null
+++ b/tools/test/h5import/Makefile.am
@@ -0,0 +1,40 @@
+#
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+##
+## Makefile.am
+## Run automake to generate a Makefile.in from this file.
+#
+# HDF5 Library Makefile(.in)
+#
+
+include $(top_srcdir)/config/commence.am
+
+# Include src and tools/lib directories
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+
+# Test programs and scripts
+TEST_PROG=h5importtest
+TEST_SCRIPT=h5importtestutil.sh
+
+check_PROGRAMS=$(TEST_PROG)
+check_SCRIPT=$(TEST_SCRIPT)
+SCRIPT_DEPEND=../../src/h5import/h5import$(EXEEXT)
+
+# All programs depend on the main hdf5 library and the tools library
+LDADD=$(LIBH5TOOLS) $(LIBHDF5)
+
+# Temporary files from h5importtest
+CHECK_CLEANFILES+=*.bin
+
+include $(top_srcdir)/config/conclude.am
diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c
new file mode 100644
index 0000000..38fd75b
--- /dev/null
+++ b/tools/test/h5import/h5importtest.c
@@ -0,0 +1,371 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <stdio.h>
+#include "H5private.h"
+
+#ifdef H5_HAVE_WIN32_API
+#define OPEN_FLAGS "wb"
+#else
+#define OPEN_FLAGS "w"
+#endif
+
+/*
+ * Name:
+ *      h5importtest
+ *
+ * Description:
+ *      This program creates that can be
+ *      used to test the h5import program.
+ *
+ */
+
+int
+main(void)
+{
+    int       nrow = 3, ncol = 4, npln = 5;
+    int       i, j, k;
+    FILE      *sp;
+
+    float     row4[3], col4[4], pln4[5];
+    float     rowo4 = 11.0F, colo4 = 21.0F, plno4 = 51.0F;
+    float     rowi4 = 1.0F, coli4 = 2.0F, plni4 = 5.0F;
+
+    int       b32i3[5][3][4];
+    int       row4i[3], col4i[4], pln4i[5];
+    int       rowo4i = 11 , colo4i = 21 , plno4i = 51 ;
+    int       rowi4i = 1 , coli4i = 2 , plni4i = 5 ;
+
+#ifdef H5_SIZEOF_LONG_LONG
+    long long row4i64[3], col4i64[4], pln4i64[5];
+    long long rowo4i64 = (long long)11 , colo4i64 = (long long)21 , plno4i64 = (long long)51 ;
+    long long rowi4i64 = (long long)1 , coli4i64 = (long long)2 , plni4i64 = (long long)5 ;
+#endif
+
+    short     b16i3[5][3][4];
+    short     row4i16[3], col4i16[4], pln4i16[5];
+    short     rowo4i16 = (short)11 , colo4i16 = (short)21 , plno4i16 = (short)51 ;
+    short     rowi4i16 = (short)1 , coli4i16 = (short)2 , plni4i16 = (short)5 ;
+
+    char      b8i3[5][3][4];
+    char      row4i8[3], col4i8[4], pln4i8[5];
+    char      rowo4i8 = (char)11 , colo4i8 = (char)21 , plno4i8 = (char)51 ;
+    char      rowi4i8 = (char)1 , coli4i8 = (char)2 , plni4i8 = (char)5 ;
+
+    double    b64r3[5][3][4];
+    double    row8[3], col8[4], pln8[5];
+    double    rowo8 = 11.0F, colo8 = 21.0F, plno8 = 51.0F;
+    double    rowi8 = 1.0F, coli8 = 2.0F, plni8 = 5.0F;
+
+
+    /*
+    * initialize the row, column, and plane vectors
+    *
+    * row values start at 11 and increment by 1 => 11, 12, 13
+    * column values start at 21 and increment by 2 => 21, 23, 25, 27
+    * plane values start at 51 and increment by 5 => 51, 56, 61, 66, 71
+    */
+
+
+    /*
+    * build array elements - rank 2
+    *
+    * element value = sum of row value and col values
+    */
+
+    row4[0] = rowo4;
+    col4[0] = colo4;
+    pln4[0] = plno4;
+
+    row8[0] = rowo8;
+    col8[0] = colo8;
+    pln8[0] = plno8;
+
+    row4i[0] = rowo4i;
+    col4i[0] = colo4i;
+    pln4i[0] = plno4i;
+
+#ifdef H5_SIZEOF_LONG_LONG
+    row4i64[0] = rowo4i64;
+    col4i64[0] = colo4i64;
+    pln4i64[0] = plno4i64;
+#endif
+
+    row4i16[0] = rowo4i16;
+    col4i16[0] = colo4i16;
+    pln4i16[0] = plno4i16;
+
+    row4i8[0] = rowo4i8;
+    col4i8[0] = colo4i8;
+    pln4i8[0] = plno4i8;
+
+    for (i = 1; i < nrow; i++)
+    {
+        row4[i] = row4[i - 1] + rowi4;
+        row8[i] = row8[i - 1] + rowi8;
+        row4i[i] = row4i[i - 1] + rowi4i;
+#ifdef H5_SIZEOF_LONG_LONG
+        row4i64[i] = row4i64[i - 1] + rowi4i64;
+#endif
+        row4i16[i] = (short)(row4i16[i - 1] + rowi4i16);
+        row4i8[i] = (char)(row4i8[i - 1] + rowi4i8);
+    }
+
+    for (j = 1; j < ncol; j++)
+    {
+        col4[j] = col4[j - 1] + coli4;
+        col8[j] = col8[j - 1] + coli8;
+        col4i[j] = col4i[j - 1] + coli4i;
+#ifdef H5_SIZEOF_LONG_LONG
+        col4i64[j] = col4i64[j - 1] + coli4i64;
+#endif
+        col4i16[j] = (short)(col4i16[j - 1] + coli4i16);
+        col4i8[j] = (char)(col4i8[j - 1] + coli4i8);
+    }
+    for (k = 1; k < npln; k++)
+    {
+        pln4[k] = pln4[k - 1] + plni4;
+        pln8[k] = pln8[k - 1] + plni8;
+        pln4i[k] = pln4i[k - 1] + plni4i;
+#ifdef H5_SIZEOF_LONG_LONG
+        pln4i64[k] = pln4i64[k - 1] + plni4i64;
+#endif
+        pln4i16[k] = (short)(pln4i16[k - 1] + plni4i16);
+        pln4i8[k] = (char)(pln4i8[k - 1] + plni4i8);
+    }
+
+    /*
+    * build array elements - rank 3
+    *
+    * element value = sum of row value, col, and plane values
+    */
+
+    for (i = 0; i < nrow; i++)
+        for (j = 0; j < ncol; j++)
+            for (k = 0; k < npln; k++) {
+                b64r3[k][i][j] = row8[i] + col8[j] + pln8[k];
+                b32i3[k][i][j] = row4i[i] + col4i[j] + pln4i[k];
+                b16i3[k][i][j] = (short)(row4i16[i] + col4i16[j] + pln4i16[k]);
+                b8i3[k][i][j] = (char)(row4i8[i] + col4i8[j] + pln4i8[k]);
+            }
+
+
+
+#ifndef UNICOS
+
+#ifdef REBUILDTEXTFILES
+ /*-------------------------------------------------------------------------
+  * 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");
+      }
+    }
+    (void) HDfclose(sp);
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST txtin32.txt -c $srcdir/testfiles/textin32.conf -o textin32.h5
+  *-------------------------------------------------------------------------
+  */
+
+    sp = HDfopen("txtin32.txt", "w");
+    for (k = 0; k < npln; k++)
+    {
+        for (i = 0; i < nrow; i++)
+        {
+            for (j = 0; j < ncol; j++)
+                (void) fprintf(sp, "%10d", b32i3[k][i][j]);
+            (void) fprintf(sp, "\n");
+        }
+    }
+    (void) HDfclose(sp);
+#endif
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST binin32.bin -c $srcdir/testfiles/binin32.conf -o binin32.h5
+  *-------------------------------------------------------------------------
+  */
+
+    sp = HDfopen("binin32.bin", OPEN_FLAGS);
+    for (k = 0; k < npln; k++)
+    {
+        for (i = 0; i < nrow; i++)
+        {
+            for (j = 0; j < ncol; j++)
+            {
+                (void) HDfwrite((char *) &b32i3[k][i][j], sizeof(int), 1, sp);
+            }
+        }
+    }
+    (void) HDfclose(sp);
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST binuin32.bin -c $srcdir/testfiles/binuin32.conf -o binuin32.h5
+  *-------------------------------------------------------------------------
+  */
+
+    sp = HDfopen("binuin32.bin", OPEN_FLAGS);
+    for (k = 0; k < npln; k++)
+    {
+        for (i = 0; i < nrow; i++)
+        {
+            for (j = 0; j < ncol; j++)
+            {
+                (void) HDfwrite((char *) &b32i3[k][i][j], sizeof(unsigned int), 1, sp);
+            }
+        }
+    }
+    (void) HDfclose(sp);
+
+
+
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST binin16.bin -c $srcdir/testfiles/binin16.conf -o binin16.h5
+  *-------------------------------------------------------------------------
+  */
+
+    sp = HDfopen("binin16.bin", OPEN_FLAGS);
+    for (k = 0; k < npln; k++)
+    {
+        for (i = 0; i < nrow; i++)
+        {
+            for (j = 0; j < ncol; j++)
+            {
+                (void) HDfwrite((char *) &b16i3[k][i][j], sizeof(short), 1, sp);
+            }
+        }
+    }
+    (void) HDfclose(sp);
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST binuin16.bin -c $srcdir/testfiles/binuin16.conf -o binuin16.h5
+  *-------------------------------------------------------------------------
+  */
+    sp = HDfopen("binuin16.bin", OPEN_FLAGS);
+    for (k = 0; k < npln; k++)
+    {
+        for (i = 0; i < nrow; i++)
+        {
+            for (j = 0; j < ncol; j++)
+            {
+                (void) HDfwrite((char *) &b16i3[k][i][j], sizeof(unsigned short), 1, sp);
+            }
+        }
+    }
+    (void) HDfclose(sp);
+
+
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST binin8.bin -c $srcdir/testfiles/binin8.conf  -o binin8.h5
+  *-------------------------------------------------------------------------
+  */
+
+    sp = HDfopen("binin8.bin", OPEN_FLAGS);
+    for (k = 0; k < npln; k++)
+    {
+        for (i = 0; i < nrow; i++)
+        {
+            for (j = 0; j < ncol; j++)
+            {
+                (void) HDfwrite((char *) &b8i3[k][i][j], sizeof(char), 1, sp);
+            }
+        }
+    }
+    (void) HDfclose(sp);
+
+#endif /* UNICOS */
+
+
+
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST binfp64.bin -c $srcdir/testfiles/binfp64.conf -o binfp64.h5
+  *-------------------------------------------------------------------------
+  */
+
+ /*
+  * binary 64-bit file - rank 2 & 3
+  */
+
+    sp = HDfopen("binfp64.bin", OPEN_FLAGS);
+    for (k = 0; k < npln; k++)
+    {
+        for (i = 0; i < nrow; i++)
+        {
+            for (j = 0; j < ncol; j++)
+            {
+                (void) HDfwrite((char *) &b64r3[k][i][j], sizeof(double), 1, sp);
+            }
+        }
+    }
+    (void) HDfclose(sp);
+
+
+
+ /*-------------------------------------------------------------------------
+  * TOOLTEST binin8w.bin -c $srcdir/testfiles/binin8w.conf -o binin8w.h5
+  *-------------------------------------------------------------------------
+  */
+
+    {
+        /* test CR+LF (13,10) and EOF (26) in windows */
+        char bin8w[4] = {13,10,26,0};
+
+        sp = HDfopen("binin8w.bin", OPEN_FLAGS);
+        for (i = 0; i < 4; i++)
+        {
+            char c = bin8w[i];
+            if ( HDfwrite( &c, sizeof(char), 1, sp) != 1 )
+                printf("error writing file\n");
+        }
+        HDfclose(sp);
+
+
+    }
+
+
+
+
+
+    return (EXIT_SUCCESS);
+}
+
diff --git a/tools/test/h5import/h5importtestutil.sh.in b/tools/test/h5import/h5importtestutil.sh.in
new file mode 100644
index 0000000..1a9a3fc
--- /dev/null
+++ b/tools/test/h5import/h5importtestutil.sh.in
@@ -0,0 +1,384 @@
+#!/bin/sh
+#
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+#
+# Tests for the  h5import tool
+
+srcdir=@srcdir@
+
+# Determine which filters are available
+USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
+
+TESTNAME=h5import
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+DUMPER=../../src/h5dump/h5dump                     # The tool name
+DUMPER_BIN=`pwd`/$DUMPER          # The path of the tool binary
+
+H5DIFF=../../src/h5diff/h5diff           # The h5diff tool name
+H5DIFF_BIN=`pwd`/$H5DIFF          # The path of the h5diff  tool binary
+
+H5IMPORT=../../src/h5import/h5import     # The h5import tool name
+H5IMPORT_BIN=`pwd`/$H5IMPORT      # The path of the h5import  tool binary
+
+RM='rm -rf'
+CP='cp'
+DIRNAME='dirname'
+LS='ls'
+AWK='awk'
+
+# initialize errors variable
+nerrors=0
+
+# source dirs
+SRC_TOOLS="$srcdir/../.."
+SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
+
+# testfiles source dirs for tools
+SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
+SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
+SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
+SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
+SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
+SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+
+TESTDIR=./testfiles
+test -d $TESTDIR || mkdir $TESTDIR
+
+######################################################################
+# test files
+# --------------------------------------------------------------------
+# All the test files copy from source directory to test directory
+# NOTE: Keep this framework to add/remove test files.
+#       Any test files from other tools can be used in this framework.
+#       This list are also used for checking exist.
+#       Comment '#' without space can be used.
+# --------------------------------------------------------------------
+LIST_HDF5_TEST_FILES="
+$SRC_H5IMPORT_TESTFILES/binfp64.h5
+$SRC_H5IMPORT_TESTFILES/binin8.h5
+$SRC_H5IMPORT_TESTFILES/binin8w.h5
+$SRC_H5IMPORT_TESTFILES/binin16.h5
+$SRC_H5IMPORT_TESTFILES/binin32.h5
+$SRC_H5IMPORT_TESTFILES/binuin16.h5
+$SRC_H5IMPORT_TESTFILES/binuin32.h5
+$SRC_H5IMPORT_TESTFILES/txtfp32.h5
+$SRC_H5IMPORT_TESTFILES/txtfp64.h5
+$SRC_H5IMPORT_TESTFILES/txtin8.h5
+$SRC_H5IMPORT_TESTFILES/txtin16.h5
+$SRC_H5IMPORT_TESTFILES/txtin32.h5
+$SRC_H5IMPORT_TESTFILES/txtuin16.h5
+$SRC_H5IMPORT_TESTFILES/txtuin32.h5
+$SRC_H5IMPORT_TESTFILES/txtstr.h5
+$SRC_H5IMPORT_TESTFILES/textpfe.h5
+"
+
+LIST_OTHER_TEST_FILES="
+$SRC_H5IMPORT_TESTFILES/binfp64.conf
+$SRC_H5IMPORT_TESTFILES/binin8.conf
+$SRC_H5IMPORT_TESTFILES/binin8w.conf
+$SRC_H5IMPORT_TESTFILES/binin16.conf
+$SRC_H5IMPORT_TESTFILES/binin32.conf
+$SRC_H5IMPORT_TESTFILES/binuin16.conf
+$SRC_H5IMPORT_TESTFILES/binuin32.conf
+$SRC_H5IMPORT_TESTFILES/txtfp32.conf
+$SRC_H5IMPORT_TESTFILES/txtfp64.conf
+$SRC_H5IMPORT_TESTFILES/txtin8.conf
+$SRC_H5IMPORT_TESTFILES/txtin16.conf
+$SRC_H5IMPORT_TESTFILES/txtin32.conf
+$SRC_H5IMPORT_TESTFILES/txtuin16.conf
+$SRC_H5IMPORT_TESTFILES/txtuin32.conf
+$SRC_H5IMPORT_TESTFILES/textpfe.conf
+$SRC_H5IMPORT_TESTFILES/txtstr.conf
+$SRC_H5IMPORT_TESTFILES/txtfp32.txt
+$SRC_H5IMPORT_TESTFILES/txtfp64.txt
+$SRC_H5IMPORT_TESTFILES/txtuin16.txt
+$SRC_H5IMPORT_TESTFILES/txtuin32.txt
+$SRC_H5IMPORT_TESTFILES/txtin8.txt
+$SRC_H5IMPORT_TESTFILES/txtin16.txt
+$SRC_H5IMPORT_TESTFILES/txtin32.txt
+$SRC_H5IMPORT_TESTFILES/textpfe64.txt
+$SRC_H5IMPORT_TESTFILES/txtstr.txt
+$SRC_H5IMPORT_TESTFILES/dbinfp64.h5.txt
+$SRC_H5IMPORT_TESTFILES/dbinin8.h5.txt
+$SRC_H5IMPORT_TESTFILES/dbinin8w.h5.txt
+$SRC_H5IMPORT_TESTFILES/dbinin16.h5.txt
+$SRC_H5IMPORT_TESTFILES/dbinin32.h5.txt
+$SRC_H5IMPORT_TESTFILES/dbinuin16.h5.txt
+$SRC_H5IMPORT_TESTFILES/dbinuin32.h5.txt
+$SRC_H5IMPORT_TESTFILES/dtxtstr.h5.txt
+"
+
+#
+# copy test files and expected output files from source dirs to test dir
+#
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES"
+
+COPY_TESTFILES_TO_TESTDIR()
+{
+    # copy test files. Used -f to make sure get a new copy
+    for tstfile in $COPY_TESTFILES
+    do
+        # ignore '#' comment
+        echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
+        RET=$?
+        if [ $RET -eq 1 ]; then
+            # skip cp if srcdir is same as destdir
+            # this occurs when build/test performed in source dir and
+            # make cp fail
+            SDIR=`$DIRNAME $tstfile`
+            INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+            INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+            if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+    	        $CP -f $tstfile $TESTDIR
+                if [ $? -ne 0 ]; then
+                    echo "Error: FAILED to copy $tstfile ."
+                
+                    # Comment out this to CREATE expected file
+                    exit $EXIT_FAILURE
+                fi
+            fi
+        fi
+    done
+}
+
+CLEAN_TESTFILES_AND_TESTDIR()
+{
+    # skip rm if srcdir is same as destdir
+    # this occurs when build/test performed in source dir and
+    # make cp fail
+    SDIR=$SRC_H5IMPORT_TESTFILES
+    INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+    INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+    if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+        $RM $TESTDIR
+    fi
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Testing".
+#
+TESTING() {
+   SPACES="                                                               "
+   echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+# Print a "SKIP" message
+SKIP() {
+   TESTING $TESTNAME $@
+    echo  " -SKIP-"
+}
+
+TOOLTEST()
+{
+err=0
+$RUNSERIAL $H5IMPORT_BIN $*
+$RUNSERIAL $DUMPER_BIN $5 >log2
+
+cd tmp_testfiles
+$RUNSERIAL $DUMPER_BIN $5 >log1
+cd ..
+
+cmp -s tmp_testfiles/log1 log2 || err=1
+rm -f log2 tmp_testfiles/log1
+if [ $err -eq 1 ]; then
+nerrors="` expr $nerrors + 1 `";
+  echo "*FAILED*"
+else
+  echo " PASSED"
+fi
+}
+
+# Use h5dump output as input to h5import for binary numbers
+# Use h5diff to verify results
+TOOLTEST2()
+{
+err=0
+$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -b tmp_testfiles/$2 > d$2.dmp
+$RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
+$RUNSERIAL $H5DIFF_BIN -v d$2 tmp_testfiles/$2 $1 $1 > log2
+$CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
+
+cmp -s log1 log2 || err=1
+rm -f log1 log2
+if [ $err -eq 1 ]; then
+nerrors="` expr $nerrors + 1 `";
+  echo "*FAILED*"
+else
+  echo " PASSED"
+fi
+}
+
+# Same as TOOLTEST2 except for strings
+# Use h5dump output as input to h5import for strings
+# Use h5diff to verify results
+TOOLTEST3()
+{
+err=0
+$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -y --width=1 tmp_testfiles/$2 > d$2.dmp
+$RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
+$RUNSERIAL $H5DIFF_BIN -v d$2 tmp_testfiles/$2 $1 $1 > log2
+$CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
+
+cmp -s log1 log2 || err=1
+rm -f log1 log2
+if [ $err -eq 1 ]; then
+nerrors="` expr $nerrors + 1 `";
+  echo "*FAILED*"
+else
+  echo " PASSED"
+fi
+}
+
+# Same as TOOLTEST3 except for h5diff uses report mode without warnings
+# Use h5dump output as input to h5import for strings
+# Use h5diff to verify results
+TOOLTEST4()
+{
+err=0
+$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -y --width=1 tmp_testfiles/$2 > d$2.dmp
+$RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
+$RUNSERIAL $H5DIFF_BIN -r d$2 tmp_testfiles/$2 $1 $1 > log2
+$CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
+
+
+cmp -s log1 log2 || err=1
+rm -f log1 log2
+if [ $err -eq 1 ]; then
+nerrors="` expr $nerrors + 1 `";
+  echo "*FAILED*"
+else
+  echo " PASSED"
+fi
+}
+
+echo "" 
+echo "=============================="
+echo "H5IMPORT tests started"
+echo "=============================="
+
+#echo "** Testing h5import  ***"
+
+rm -f  output.h5 log1 tx* b* *.dat
+
+# prepare for test
+COPY_TESTFILES_TO_TESTDIR
+
+mkdir tmp_testfiles
+$CP $TESTDIR/*.h5 ./tmp_testfiles/
+
+$RUNSERIAL ./h5importtest
+
+################################################
+###        T H E   T E S T S
+################################################
+
+TESTING "ASCII I32 rank 3 - Output BE " ;
+TOOLTEST $TESTDIR/txtin32.txt -c $TESTDIR/txtin32.conf -o txtin32.h5
+
+TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
+TOOLTEST $TESTDIR/txtin16.txt -c $TESTDIR/txtin16.conf -o txtin16.h5
+
+TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed " 
+TOOLTEST $TESTDIR/txtin8.txt -c $TESTDIR/txtin8.conf  -o txtin8.h5
+
+
+TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
+TOOLTEST $TESTDIR/txtuin16.txt -c $TESTDIR/txtuin16.conf -o txtuin16.h5
+
+TESTING "ASCII UI32 - rank 3 - Output BE" 
+TOOLTEST $TESTDIR/txtuin32.txt -c $TESTDIR/txtuin32.conf -o txtuin32.h5
+
+
+TESTING "ASCII F32 - rank 3 - Output LE " 
+TOOLTEST $TESTDIR/txtfp32.txt -c $TESTDIR/txtfp32.conf -o txtfp32.h5
+
+TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
+TOOLTEST $TESTDIR/txtfp64.txt -c $TESTDIR/txtfp64.conf -o txtfp64.h5
+
+
+TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
+TOOLTEST binfp64.bin -c $TESTDIR/binfp64.conf -o binfp64.h5
+TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
+if test $USE_FILTER_DEFLATE != "yes"; then
+ SKIP "/fp/bin/64-bit" binfp64.h5
+else
+ TOOLTEST2 "/fp/bin/64-bit" binfp64.h5
+fi
+
+
+TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
+TOOLTEST binin8.bin -c $TESTDIR/binin8.conf -o binin8.h5
+TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
+if test $USE_FILTER_DEFLATE != "yes"; then
+ SKIP "/int/bin/8-bit" binin8.h5
+else
+ TOOLTEST2 "/int/bin/8-bit" binin8.h5
+fi
+
+TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
+TOOLTEST binin16.bin -c $TESTDIR/binin16.conf -o binin16.h5
+TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
+TOOLTEST2 "/int/bin/16-bit" binin16.h5
+
+TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED " 
+TOOLTEST binin32.bin -c $TESTDIR/binin32.conf -o binin32.h5
+TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED " 
+TOOLTEST2 "/int/bin/32-bit" binin32.h5
+
+
+TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
+TOOLTEST binuin16.bin -c $TESTDIR/binuin16.conf -o binuin16.h5
+TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
+TOOLTEST2 "/int/buin/16-bit" binuin16.h5
+
+TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED " 
+TOOLTEST binuin32.bin -c $TESTDIR/binuin32.conf -o binuin32.h5
+TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED " 
+TOOLTEST2 "/int/buin/32-bit" binuin32.h5
+
+
+TESTING "STR" 
+TOOLTEST $TESTDIR/txtstr.txt -c $TESTDIR/txtstr.conf -o txtstr.h5
+TESTING "H5DUMP-STR" 
+TOOLTEST4 "/mytext/data" txtstr.h5
+
+
+TESTING "BINARY I8 CR LF EOF" 
+TOOLTEST binin8w.bin -c $TESTDIR/binin8w.conf -o binin8w.h5
+TESTING "H5DUMP-BINARY I8 CR LF EOF" 
+TOOLTEST2 "/dataset0" binin8w.h5
+
+TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE " 
+TOOLTEST $TESTDIR/textpfe64.txt -c $TESTDIR/textpfe.conf -o textpfe.h5
+
+
+rm -f  txtin32.txt txtin16.txt txtin8.txt txtuin32.txt txtuin16.txt *.bin *.dmp *.imp *.h5
+rm -rf tmp_testfiles
+
+# Clean up temporary files/directories
+CLEAN_TESTFILES_AND_TESTDIR
+
+#
+# Check errors result
+if test $nerrors -eq 0 ; then
+    echo "All $TESTNAME tests passed."
+    exit $EXIT_SUCCESS
+else
+    echo "$TESTNAME tests failed with $nerrors errors."
+    exit $EXIT_FAILURE
+fi
diff --git a/tools/test/h5import/testfiles/binfp64.conf b/tools/test/h5import/testfiles/binfp64.conf
new file mode 100644
index 0000000..6b4c361
--- /dev/null
+++ b/tools/test/h5import/testfiles/binfp64.conf
@@ -0,0 +1,13 @@
+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/binfp64.h5 b/tools/test/h5import/testfiles/binfp64.h5
new file mode 100644
index 0000000..80e3a8a
--- /dev/null
+++ b/tools/test/h5import/testfiles/binfp64.h5
diff --git a/tools/test/h5import/testfiles/binin16.conf b/tools/test/h5import/testfiles/binin16.conf
new file mode 100644
index 0000000..06869cb
--- /dev/null
+++ b/tools/test/h5import/testfiles/binin16.conf
@@ -0,0 +1,12 @@
+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/binin16.h5 b/tools/test/h5import/testfiles/binin16.h5
new file mode 100644
index 0000000..0825bbc
--- /dev/null
+++ b/tools/test/h5import/testfiles/binin16.h5
diff --git a/tools/test/h5import/testfiles/binin32.conf b/tools/test/h5import/testfiles/binin32.conf
new file mode 100644
index 0000000..11996ef
--- /dev/null
+++ b/tools/test/h5import/testfiles/binin32.conf
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..fd8faa9
--- /dev/null
+++ b/tools/test/h5import/testfiles/binin32.h5
diff --git a/tools/test/h5import/testfiles/binin8.conf b/tools/test/h5import/testfiles/binin8.conf
new file mode 100644
index 0000000..1edd80a
--- /dev/null
+++ b/tools/test/h5import/testfiles/binin8.conf
@@ -0,0 +1,16 @@
+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/binin8.h5 b/tools/test/h5import/testfiles/binin8.h5
new file mode 100644
index 0000000..a1d1a37
--- /dev/null
+++ b/tools/test/h5import/testfiles/binin8.h5
diff --git a/tools/test/h5import/testfiles/binin8w.conf b/tools/test/h5import/testfiles/binin8w.conf
new file mode 100644
index 0000000..fccb4ac
--- /dev/null
+++ b/tools/test/h5import/testfiles/binin8w.conf
@@ -0,0 +1,9 @@
+
+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/binin8w.h5 b/tools/test/h5import/testfiles/binin8w.h5
new file mode 100644
index 0000000..64acaed
--- /dev/null
+++ b/tools/test/h5import/testfiles/binin8w.h5
diff --git a/tools/test/h5import/testfiles/binuin16.conf b/tools/test/h5import/testfiles/binuin16.conf
new file mode 100644
index 0000000..a4603df
--- /dev/null
+++ b/tools/test/h5import/testfiles/binuin16.conf
@@ -0,0 +1,12 @@
+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/binuin16.h5 b/tools/test/h5import/testfiles/binuin16.h5
new file mode 100644
index 0000000..c486c89
--- /dev/null
+++ b/tools/test/h5import/testfiles/binuin16.h5
diff --git a/tools/test/h5import/testfiles/binuin32.conf b/tools/test/h5import/testfiles/binuin32.conf
new file mode 100644
index 0000000..a649e97
--- /dev/null
+++ b/tools/test/h5import/testfiles/binuin32.conf
@@ -0,0 +1,12 @@
+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/binuin32.h5 b/tools/test/h5import/testfiles/binuin32.h5
new file mode 100644
index 0000000..41699d7
--- /dev/null
+++ b/tools/test/h5import/testfiles/binuin32.h5
diff --git a/tools/test/h5import/testfiles/dbinfp64.h5.txt b/tools/test/h5import/testfiles/dbinfp64.h5.txt
new file mode 100644
index 0000000..fb88984
--- /dev/null
+++ b/tools/test/h5import/testfiles/dbinfp64.h5.txt
@@ -0,0 +1,2 @@
+dataset: </fp/bin/64-bit> and </fp/bin/64-bit>
+0 differences found
diff --git a/tools/test/h5import/testfiles/dbinin16.h5.txt b/tools/test/h5import/testfiles/dbinin16.h5.txt
new file mode 100644
index 0000000..b94781e
--- /dev/null
+++ b/tools/test/h5import/testfiles/dbinin16.h5.txt
@@ -0,0 +1,2 @@
+dataset: </int/bin/16-bit> and </int/bin/16-bit>
+0 differences found
diff --git a/tools/test/h5import/testfiles/dbinin32.h5.txt b/tools/test/h5import/testfiles/dbinin32.h5.txt
new file mode 100644
index 0000000..a35cd79
--- /dev/null
+++ b/tools/test/h5import/testfiles/dbinin32.h5.txt
@@ -0,0 +1,2 @@
+dataset: </int/bin/32-bit> and </int/bin/32-bit>
+0 differences found
diff --git a/tools/test/h5import/testfiles/dbinin8.h5.txt b/tools/test/h5import/testfiles/dbinin8.h5.txt
new file mode 100644
index 0000000..bbc6c67
--- /dev/null
+++ b/tools/test/h5import/testfiles/dbinin8.h5.txt
@@ -0,0 +1,2 @@
+dataset: </int/bin/8-bit> and </int/bin/8-bit>
+0 differences found
diff --git a/tools/test/h5import/testfiles/dbinin8w.h5.txt b/tools/test/h5import/testfiles/dbinin8w.h5.txt
new file mode 100644
index 0000000..28d43d2
--- /dev/null
+++ b/tools/test/h5import/testfiles/dbinin8w.h5.txt
@@ -0,0 +1,2 @@
+dataset: </dataset0> and </dataset0>
+0 differences found
diff --git a/tools/test/h5import/testfiles/dbinuin16.h5.txt b/tools/test/h5import/testfiles/dbinuin16.h5.txt
new file mode 100644
index 0000000..ecad7a0
--- /dev/null
+++ b/tools/test/h5import/testfiles/dbinuin16.h5.txt
@@ -0,0 +1,2 @@
+dataset: </int/buin/16-bit> and </int/buin/16-bit>
+0 differences found
diff --git a/tools/test/h5import/testfiles/dbinuin32.h5.txt b/tools/test/h5import/testfiles/dbinuin32.h5.txt
new file mode 100644
index 0000000..cc1d9f3
--- /dev/null
+++ b/tools/test/h5import/testfiles/dbinuin32.h5.txt
@@ -0,0 +1,2 @@
+dataset: </int/buin/32-bit> and </int/buin/32-bit>
+0 differences found
diff --git a/tools/test/h5import/testfiles/dtxtstr.h5.txt b/tools/test/h5import/testfiles/dtxtstr.h5.txt
new file mode 100644
index 0000000..2170300
--- /dev/null
+++ b/tools/test/h5import/testfiles/dtxtstr.h5.txt
@@ -0,0 +1,2 @@
+dataset: </mytext/data> and </mytext/data>
+0 differences found
diff --git a/tools/test/h5import/testfiles/textpfe.conf b/tools/test/h5import/testfiles/textpfe.conf
new file mode 100644
index 0000000..6404d5f
--- /dev/null
+++ b/tools/test/h5import/testfiles/textpfe.conf
@@ -0,0 +1,12 @@
+PATH /test
+INPUT-CLASS TEXTFPE
+INPUT-SIZE 64
+RANK 1
+DIMENSION-SIZES 2
+OUTPUT-CLASS FP
+OUTPUT-BYTE-ORDER LE
+OUTPUT-SIZE 64
+
+
+
+
diff --git a/tools/test/h5import/testfiles/textpfe.h5 b/tools/test/h5import/testfiles/textpfe.h5
new file mode 100644
index 0000000..213051d
--- /dev/null
+++ b/tools/test/h5import/testfiles/textpfe.h5
diff --git a/tools/test/h5import/testfiles/textpfe64.txt b/tools/test/h5import/testfiles/textpfe64.txt
new file mode 100644
index 0000000..f6dd7f4
--- /dev/null
+++ b/tools/test/h5import/testfiles/textpfe64.txt
@@ -0,0 +1,2 @@
+6.02E+24
+3.14159265E+00
diff --git a/tools/test/h5import/testfiles/txtfp32.conf b/tools/test/h5import/testfiles/txtfp32.conf
new file mode 100644
index 0000000..9696a7f
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtfp32.conf
@@ -0,0 +1,10 @@
+PATH /fp/32-bit
+INPUT-CLASS TEXTFP
+INPUT-SIZE	32
+RANK 3
+DIMENSION-SIZES 2 4 3
+OUTPUT-ARCHITECTURE IEEE
+OUTPUT-BYTE-ORDER LE
+
+
+
diff --git a/tools/test/h5import/testfiles/txtfp32.h5 b/tools/test/h5import/testfiles/txtfp32.h5
new file mode 100644
index 0000000..f74e003
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtfp32.h5
diff --git a/tools/test/h5import/testfiles/txtfp32.txt b/tools/test/h5import/testfiles/txtfp32.txt
new file mode 100644
index 0000000..142c94f
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtfp32.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/test/h5import/testfiles/txtfp64.conf b/tools/test/h5import/testfiles/txtfp64.conf
new file mode 100644
index 0000000..fbab6a6
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtfp64.conf
@@ -0,0 +1,13 @@
+PATH /fp/64-bit
+INPUT-CLASS TEXTFP
+INPUT-SIZE	64
+RANK 3
+DIMENSION-SIZES 4 4 3
+OUTPUT-ARCHITECTURE IEEE
+OUTPUT-BYTE-ORDER BE
+CHUNKED-DIMENSION-SIZES 2 2 2
+COMPRESSION-PARAM 8
+MAXIMUM-DIMENSIONS -1 6 7
+
+
+
diff --git a/tools/test/h5import/testfiles/txtfp64.h5 b/tools/test/h5import/testfiles/txtfp64.h5
new file mode 100644
index 0000000..b6ba4f5
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtfp64.h5
diff --git a/tools/test/h5import/testfiles/txtfp64.txt b/tools/test/h5import/testfiles/txtfp64.txt
new file mode 100644
index 0000000..6c83dc3
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtfp64.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/test/h5import/testfiles/txtin16.conf b/tools/test/h5import/testfiles/txtin16.conf
new file mode 100644
index 0000000..d2d11c3
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin16.conf
@@ -0,0 +1,12 @@
+PATH /int/16-bit
+INPUT-CLASS TEXTIN
+INPUT-SIZE	16
+RANK 3
+DIMENSION-SIZES 2 4 3
+OUTPUT-BYTE-ORDER LE
+CHUNKED-DIMENSION-SIZES 2 2 2
+MAXIMUM-DIMENSIONS -1 -1 8
+OUTPUT-ARCHITECTURE STD
+
+
+
diff --git a/tools/test/h5import/testfiles/txtin16.h5 b/tools/test/h5import/testfiles/txtin16.h5
new file mode 100644
index 0000000..dc6c1ea
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin16.h5
diff --git a/tools/test/h5import/testfiles/txtin16.txt b/tools/test/h5import/testfiles/txtin16.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin16.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/test/h5import/testfiles/txtin32.conf b/tools/test/h5import/testfiles/txtin32.conf
new file mode 100644
index 0000000..ca4802a
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin32.conf
@@ -0,0 +1,11 @@
+PATH /int/32-bit
+INPUT-CLASS TEXTIN
+INPUT-SIZE 32
+RANK 3
+DIMENSION-SIZES 2 4 3
+OUTPUT-ARCHITECTURE STD
+OUTPUT-BYTE-ORDER BE
+
+
+
+
diff --git a/tools/test/h5import/testfiles/txtin32.h5 b/tools/test/h5import/testfiles/txtin32.h5
new file mode 100644
index 0000000..350333c
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin32.h5
diff --git a/tools/test/h5import/testfiles/txtin32.txt b/tools/test/h5import/testfiles/txtin32.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin32.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/test/h5import/testfiles/txtin8.conf b/tools/test/h5import/testfiles/txtin8.conf
new file mode 100644
index 0000000..9dbfd2b
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin8.conf
@@ -0,0 +1,18 @@
+PATH /int/8-bit
+INPUT-CLASS TEXTIN
+INPUT-SIZE	8
+OUTPUT-CLASS IN
+OUTPUT-SIZE 8
+OUTPUT-BYTE-ORDER LE
+OUTPUT-ARCHITECTURE STD
+RANK 3
+DIMENSION-SIZES 2 4 3
+CHUNKED-DIMENSION-SIZES 2 2 2
+MAXIMUM-DIMENSIONS -1 -1 -1
+COMPRESSION-PARAM 3
+COMPRESSION-TYPE GZIP
+
+
+
+
+
diff --git a/tools/test/h5import/testfiles/txtin8.h5 b/tools/test/h5import/testfiles/txtin8.h5
new file mode 100644
index 0000000..42e7727
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin8.h5
diff --git a/tools/test/h5import/testfiles/txtin8.txt b/tools/test/h5import/testfiles/txtin8.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtin8.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/test/h5import/testfiles/txtstr.conf b/tools/test/h5import/testfiles/txtstr.conf
new file mode 100644
index 0000000..85079e0
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtstr.conf
@@ -0,0 +1,6 @@
+PATH /mytext/data
+INPUT-CLASS STR
+
+
+
+
diff --git a/tools/test/h5import/testfiles/txtstr.h5 b/tools/test/h5import/testfiles/txtstr.h5
new file mode 100644
index 0000000..ceb0810
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtstr.h5
diff --git a/tools/test/h5import/testfiles/txtstr.txt b/tools/test/h5import/testfiles/txtstr.txt
new file mode 100644
index 0000000..25be0a6
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtstr.txt
@@ -0,0 +1,2 @@
+ hello world
+ hello world again
diff --git a/tools/test/h5import/testfiles/txtuin16.conf b/tools/test/h5import/testfiles/txtuin16.conf
new file mode 100644
index 0000000..753e6e8
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtuin16.conf
@@ -0,0 +1,12 @@
+PATH /int/uint/16-bit
+INPUT-CLASS TEXTUIN
+INPUT-SIZE	16
+RANK 2
+DIMENSION-SIZES 4 3
+COMPRESSION-PARAM 2
+CHUNKED-DIMENSION-SIZES 2 2
+OUTPUT-ARCHITECTURE STD
+OUTPUT-BYTE-ORDER LE
+
+
+
diff --git a/tools/test/h5import/testfiles/txtuin16.h5 b/tools/test/h5import/testfiles/txtuin16.h5
new file mode 100644
index 0000000..9ee166a
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtuin16.h5
diff --git a/tools/test/h5import/testfiles/txtuin16.txt b/tools/test/h5import/testfiles/txtuin16.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtuin16.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/test/h5import/testfiles/txtuin32.conf b/tools/test/h5import/testfiles/txtuin32.conf
new file mode 100644
index 0000000..d61e1a1
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtuin32.conf
@@ -0,0 +1,11 @@
+PATH /int/uint/32-bit
+INPUT-CLASS TEXTUIN
+INPUT-SIZE	32
+RANK 3
+DIMENSION-SIZES 2 4 3
+OUTPUT-ARCHITECTURE STD
+OUTPUT-BYTE-ORDER BE
+
+
+
+
diff --git a/tools/test/h5import/testfiles/txtuin32.h5 b/tools/test/h5import/testfiles/txtuin32.h5
new file mode 100644
index 0000000..1a4dda5
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtuin32.h5
diff --git a/tools/test/h5import/testfiles/txtuin32.txt b/tools/test/h5import/testfiles/txtuin32.txt
new file mode 100644
index 0000000..0688e9b
--- /dev/null
+++ b/tools/test/h5import/testfiles/txtuin32.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