[svn-r18273] Purpose:

    bugzilla 1754: h5diff: support comparing through links.

Description:
    Fix incorrect (or hanging) behavior in parallel mode when specifying 
    invalid combination of command options. 
    (ex: -v and -q , --no-dangling-links without --follow-links)
    Add relate test case
    Update h5diffgentest.c due to add test files this and previous time

Note:
    svn #18266 (prior to this)
    svn #18164 (original check-in)

Tested:
    h5committest (jam, amani and linew)

1 files changed, 0 insertions, 19 deletions

diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 6f33bb0..8089161 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -88,25 +88,6 @@ int main(int argc, const char *argv[])
 
     parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
 
-   /*-------------------------------------------------------------------------
-    * check invalid combination of options
-    *-----------------------------------------------------------------------*/
-    /* no -q(quiet) with -v (verbose) or -r (report) */
-    if(options.m_quiet && (options.m_verbose || options.m_report))
-    {
-        parallel_print("Error: -q (quiet mode) cannot be added to verbose or report modes\n");
-        options.err_stat=1;
-        goto out;
-    }
-
-    /* only allow --no-dangling-links along with --follow-links */
-    if(options.no_dangle_links && !options.follow_links)
-    {
-        parallel_print("Error: --no-dangling-links must be used along with --follow-links option.\n");
-        options.err_stat=1;
-        goto out;
-    }
-
     /*-------------------------------------------------------------------------
     * do the diff
     *-------------------------------------------------------------------------