summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MANIFEST8
-rw-r--r--tools/src/h5diff/h5diff_common.c9
2 files changed, 13 insertions, 4 deletions
diff --git a/MANIFEST b/MANIFEST
index 6b79642..e16fb8e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2415,6 +2415,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
@@ -2660,24 +2661,31 @@
./tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
./tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
./tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.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 1ca4f2b..8c88510 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -69,6 +69,7 @@ static void check_options(diff_opt_t* opts)
}
}
+#if TRILABS-227
/*-------------------------------------------------------------------------
* Function: parse_hsize_list
*
@@ -84,7 +85,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)
{
@@ -134,7 +134,6 @@ parse_hsize_list(const char *h_list, subset_d *d)
d->len = size_count;
H5TOOLS_ENDDEBUG("");
}
-#endif
/*-------------------------------------------------------------------------
* Function: parse_subset_params
@@ -145,7 +144,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)
{
@@ -444,10 +442,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("");
}