diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-08-15 23:16:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-08-15 23:16:30 (GMT) |
| commit | e0d59f92bbd5014a9f141da18937fd5b2fc1d8c0 (patch) | |
| tree | 8096f5c3b85848668dcc2bedd39b2f8530a8c9c4 | |
| parent | 2926483de82c948e094bf9ad79c7200decf6e277 (diff) | |
| download | hdf5-e0d59f92bbd5014a9f141da18937fd5b2fc1d8c0.zip hdf5-e0d59f92bbd5014a9f141da18937fd5b2fc1d8c0.tar.gz hdf5-e0d59f92bbd5014a9f141da18937fd5b2fc1d8c0.tar.bz2 | |
Tag TRILABS-227 changes and fix MANIFEST
| -rw-r--r-- | MANIFEST | 8 | ||||
| -rw-r--r-- | tools/src/h5diff/h5diff_common.c | 9 |
2 files changed, 13 insertions, 4 deletions
@@ -2491,6 +2491,7 @@ ./tools/test/h5diff/testfiles/h5diff_80.txt ./tools/test/h5diff/testfiles/h5diff_800.txt ./tools/test/h5diff/testfiles/h5diff_801.txt +./tools/test/h5diff/testfiles/h5diff_830.txt ./tools/test/h5diff/testfiles/h5diff_90.txt ./tools/test/h5diff/testfiles/h5diff_100.txt ./tools/test/h5diff/testfiles/h5diff_101.txt @@ -2740,24 +2741,31 @@ ./tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl ./tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl ./tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl +./tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl ./tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst ./tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl ./tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl +./tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl ./tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst ./tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl ./tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl +./tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl ./tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst ./tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl ./tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl +./tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl ./tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst ./tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl ./tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl +./tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl ./tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst ./tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl ./tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl +./tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl ./tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst ./tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl ./tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl +./tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 # jam utility and tests ./tools/src/h5jam/Makefile.am diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index a4fe3bb..8ed2d37 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -75,6 +75,7 @@ static void check_options(diff_opt_t* opts) } } +#if TRILABS-227 /*------------------------------------------------------------------------- * Function: parse_hsize_list * @@ -90,7 +91,6 @@ static void check_options(diff_opt_t* opts) * Return: <none> *------------------------------------------------------------------------- */ -#if 0 static void parse_hsize_list(const char *h_list, subset_d *d) { @@ -140,7 +140,6 @@ parse_hsize_list(const char *h_list, subset_d *d) d->len = size_count; H5TOOLS_ENDDEBUG(""); } -#endif /*------------------------------------------------------------------------- * Function: parse_subset_params @@ -151,7 +150,6 @@ parse_hsize_list(const char *h_list, subset_d *d) * Failure: NULL *------------------------------------------------------------------------- */ -#if 0 static struct subset_t * parse_subset_params(const char *dset) { @@ -482,10 +480,13 @@ void parse_command_line(int argc, const char* argv[], const char** fname1, const /* * TRILABS-227 is complete except for an issue with printing indices * the following calls will enable subsetting + */ +#if TRILABS-227 opts->sset[0] = parse_subset_params(*objname1); opts->sset[1] = parse_subset_params(*objname2); - */ +#endif + H5TOOLS_ENDDEBUG(""); } |