1.10 Merge of tools perform reorg and command line args (#960)

* Merge of tools perform reorg and command line args

Also sync tools change with 1.12

* Add missing file

1 files changed, 38 insertions, 35 deletions

diff --git a/MANIFEST b/MANIFEST
index 614a85a..48eef8f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1116,6 +1116,7 @@
 ./test/cmpd_dtransform.c
 ./test/cork.c
 ./test/corrupt_stab_msg.h5
+./test/corrupted_name_len.h5
 ./test/cross_read.c
 ./test/dangle.c
 ./test/deflate.h5
@@ -1123,13 +1124,15 @@
 ./test/direct_chunk.c
 ./test/dsets.c
 ./test/dt_arith.c
-./test/dtypes.c
 ./test/dtransform.c
+./test/dtypes.c
 ./test/earray.c
 ./test/efc.c
 ./test/enc_dec_plist.c
 ./test/enc_dec_plist_cross_platform.c
 ./test/enum.c
+./test/err_compat.c
+./test/error_test.c
 ./test/evict_on_close.c
 ./test/extend.c
 ./test/external.c
@@ -1137,25 +1140,21 @@
 ./test/external_common.h
 ./test/external_env.c
 ./test/external_fname.h
-./test/error_test.c
-./test/err_compat.c
-./test/filter_error.h5
-./test/links_env.c
 ./test/family_v16_00000.h5
 ./test/family_v16_00001.h5
 ./test/family_v16_00002.h5
 ./test/family_v16_00003.h5
 ./test/farray.c
 ./test/fheap.c
-./test/filespace_1_8.h5
-./test/filespace_1_6.h5
-./test/freespace.c
-./test/filenotclosed.c
 ./test/file_image.c
 ./test/file_image_core_test.h5
-./test/fill_old.h5
+./test/filenotclosed.c
+./test/filespace_1_6.h5
+./test/filespace_1_8.h5
 ./test/fill18.h5
+./test/fill_old.h5
 ./test/fillval.c
+./test/filter_error.h5
 ./test/filter_fail.c
 ./test/filter_plugin.c
 ./test/filter_plugin1_dsets.c
@@ -1165,13 +1164,12 @@
 ./test/flush1.c
 ./test/flush2.c
 ./test/flushrefresh.c
+./test/freespace.c
 ./test/fsm_aggr_nopersist.h5
 ./test/fsm_aggr_persist.h5
-./test/genall5.c
-./test/genall5.h
+./test/gen_bad_compound.c
 ./test/gen_bad_offset.c
 ./test/gen_bad_ohdr.c
-./test/gen_bad_compound.c
 ./test/gen_bogus.c
 ./test/gen_bounds.c
 ./test/gen_cross.c
@@ -1195,6 +1193,8 @@
 ./test/gen_sizes_lheap.c
 ./test/gen_specmetaread.c
 ./test/gen_udlinks.c
+./test/genall5.c
+./test/genall5.h
 ./test/getname.c
 ./test/gheap.c
 ./test/group_old.h5
@@ -1214,7 +1214,7 @@
 ./test/le_extlink2.h5
 ./test/lheap.c
 ./test/links.c
-./test/corrupted_name_len.h5
+./test/links_env.c
 ./test/mergemsg.h5
 ./test/mf.c
 ./test/mirror_vfd.c
@@ -1225,14 +1225,14 @@
 ./test/noencoder.h5
 ./test/none.h5
 ./test/ntypes.c
-./test/ohdr.c
 ./test/objcopy.c
+./test/ohdr.c
 ./test/page_buffer.c
 ./test/paged_nopersist.h5
 ./test/paged_persist.h5
+./test/pool.c
 ./test/reserved.c
 ./test/ros3.c
-./test/pool.c
 ./test/s3comms.c
 ./test/set_extent.c
 # ====distribute this for now. See HDFFV-8236====
@@ -1258,29 +1258,29 @@
 ./test/tattr.c
 ./test/tbad_msg_count.h5
 ./test/tbogus.h5
-./test/tchecksum.c
 ./test/tcheck_version.c
+./test/tchecksum.c
 ./test/tconfig.c
 ./test/tcoords.c
+./test/test_filter_plugin.sh.in
+./test/test_filters_be.h5
+./test/test_filters_le.h5
+./test/test_usecases.sh.in
 ./test/testabort_fail.sh.in
 ./test/testcheck_version.sh.in
-./test/testexternal_env.sh.in
 ./test/testerror.sh.in
-./test/testlinks_env.sh.in
-./test/test_filter_plugin.sh.in
-./test/test_filters_le.h5
-./test/test_filters_be.h5
+./test/testexternal_env.sh.in
 ./test/testflushrefresh.sh.in
 ./test/testframe.c
 ./test/testhdf5.c
 ./test/testhdf5.h
 ./test/testlibinfo.sh.in
-./test/test_mirror.sh.in
-./test/test_usecases.sh.in
+./test/testlinks_env.sh.in
 ./test/testmeta.c
+./test/test_mirror.sh.in
 ./test/testswmr.sh.in
-./test/testvdsswmr.sh.in
 ./test/testvds_env.sh.in
+./test/testvdsswmr.sh.in
 ./test/tfile.c
 ./test/tgenprop.c
 ./test/th5o.c
@@ -1296,13 +1296,13 @@
 ./test/tmisc.c
 ./test/tmtimen.h5
 ./test/tmtimeo.h5
-./test/ttime.c
 ./test/trefer.c
 ./test/trefstr.c
 ./test/tselect.c
 ./test/tsizeslheap.h5
 ./test/tskiplist.c
 ./test/tsohm.c
+./test/ttime.c
 ./test/ttsafe.c
 ./test/ttsafe.h
 ./test/ttsafe_acreate.c
@@ -1316,19 +1316,19 @@
 ./test/twriteorder.c
 ./test/unlink.c
 ./test/unregister.c
+./test/use.h
 ./test/use_append_chunk.c
 ./test/use_append_chunk_mirror.c
 ./test/use_append_mchunks.c
 ./test/use_common.c
 ./test/use_disable_mdc_flushes.c
-./test/use.h
-./test/version_bounds_1_10.c
 ./test/vds.c
 ./test/vds_env.c
 ./test/vds_swmr.h
 ./test/vds_swmr_gen.c
 ./test/vds_swmr_reader.c
 ./test/vds_swmr_writer.c
+./test/version_bounds_1_10.c
 ./test/vfd.c
 
 ./test/testfiles/err_compat_1
@@ -2855,6 +2855,15 @@
 ./tools/testfiles/h5mkgrp_single_p.ls
 ./tools/testfiles/h5mkgrp_single_l.ls
 
+./tools/src/h5perf/Makefile.am
+./tools/src/h5perf/perf.c
+./tools/src/h5perf/pio_engine.c
+./tools/src/h5perf/pio_perf.c
+./tools/src/h5perf/pio_perf.h
+./tools/src/h5perf/sio_engine.c
+./tools/src/h5perf/sio_perf.c
+./tools/src/h5perf/sio_perf.h
+
 ./tools/test/perform/Makefile.am
 ./tools/test/perform/build_h5perf_alone.sh
 ./tools/test/perform/build_h5perf_serial_alone.sh
@@ -2864,16 +2873,9 @@
 ./tools/test/perform/gen_report.pl
 ./tools/test/perform/iopipe.c
 ./tools/test/perform/overhead.c
-./tools/test/perform/perf.c
 ./tools/test/perform/perf_meta.c
-./tools/test/perform/pio_engine.c
-./tools/test/perform/pio_perf.c
-./tools/test/perform/pio_perf.h
 ./tools/test/perform/pio_standalone.c
 ./tools/test/perform/pio_standalone.h
-./tools/test/perform/sio_engine.c
-./tools/test/perform/sio_perf.c
-./tools/test/perform/sio_perf.h
 ./tools/test/perform/sio_standalone.c
 ./tools/test/perform/sio_standalone.h
 ./tools/test/perform/zip_perf.c
@@ -3608,6 +3610,7 @@
 ./tools/test/h5stat/CMakeLists.txt
 ./tools/test/h5stat/CMakeTests.cmake
 ./tools/src/misc/CMakeLists.txt
+./tools/src/h5perf/CMakeLists.txt
 ./tools/test/misc/CMakeLists.txt
 ./tools/test/misc/CMakeTestsClear.cmake
 ./tools/test/misc/CMakeTestsMkgrp.cmake