33 files changed, 36 insertions, 36 deletions
diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake
index 73cb2ee..3046521 100644
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@@ -79,15 +79,15 @@
   add_custom_target(h5fc-files ALL COMMENT "Copying files needed by h5fc tests")
 
   foreach (ddl_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
   endforeach ()
   add_custom_target(h5fc_files ALL COMMENT "Copying files needed by h5fc tests" DEPENDS ${h5fc_files_list})
 
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl b/tools/test/h5format_convert/expected/h5fc_d_file.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_d_file.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err
index ceb0fe4..ceb0fe4 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl b/tools/test/h5format_convert/expected/h5fc_dname.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_dname.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.err b/tools/test/h5format_convert/expected/h5fc_dname.err
index 361d8a9..361d8a9 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_dname.err
+++ b/tools/test/h5format_convert/expected/h5fc_dname.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
index f788913..f788913 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
index 6564031..6564031 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
index 746de2b..746de2b 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
index 57781ec..57781ec 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
index 8fd061d..8fd061d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
index 435ed46..435ed46 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
index 57a78d3..57a78d3 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_help.ddl b/tools/test/h5format_convert/expected/h5fc_help.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_help.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_help.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err
index 39450c0..39450c0 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err
index 706ea9d..706ea9d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nooption.ddl b/tools/test/h5format_convert/expected/h5fc_nooption.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nooption.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_nooption.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_all.ddl
index c5e55c7..c5e55c7 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_all.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_all.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl
index 23f775d..23f775d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl b/tools/test/h5format_convert/expected/h5fc_v_err.ddl
index 066f2d5..066f2d5 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_err.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err
index e72892d..e72892d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl
index 1c6d7fb..1c6d7fb 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl
index ad00d92..ad00d92 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl
index e79b11a..e79b11a 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl
index 50575c0..50575c0 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
index 45fa3fb..45fa3fb 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
index 67a7116..67a7116 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
index 7f67d9f..7f67d9f 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
index 350d3ba..350d3ba 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
index 6b2b2c3..6b2b2c3 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
index 4a038e3..4a038e3 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
index 602627f..602627f 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
diff --git a/tools/test/h5format_convert/testh5fc.sh.in b/tools/test/h5format_convert/testh5fc.sh.in
index cd2b801..4ba46cb 100644
--- a/tools/test/h5format_convert/testh5fc.sh.in
+++ b/tools/test/h5format_convert/testh5fc.sh.in
@@ -49,11 +49,10 @@ verbose=yes
 
 # 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_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/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"
@@ -61,6 +60,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5FORMCONV_TESTFILES="$SRC_TOOLS/test/h5format_convert/testfiles"
+SRC_H5FORMCONV_OUTFILES="$SRC_TOOLS/test/h5format_convert/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -103,39 +103,39 @@ $SRC_H5FORMCONV_TESTFILES/h5fc_err_level.h5
 "
 
 LIST_ERR_TEST_FILES="
-$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_dname.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistfile.ddl.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistdset_file.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_dname.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistfile.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistdset_file.ddl.err
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5FORMCONV_TESTFILES/h5fc_help.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_nooption.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_dname.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_non_chunked.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_bt1.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_ndata_bt1.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_all.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_1d.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_all.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_i.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_s.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_f.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_if.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_is.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_sf.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext3_isf.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_i.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_s.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_f.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_if.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_is.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_sf.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext3_isf.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_help.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_nooption.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_dname.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_non_chunked.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_bt1.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_ndata_bt1.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_all.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_1d.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_all.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_i.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_s.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_f.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_if.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_is.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_sf.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext3_isf.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_i.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_s.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_f.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_if.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_is.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_sf.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext3_isf.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl.err
 "
 
 #