[svn-r15900] Make the h5copy test that renames a group to return 1 on the h5diff call and assume 1 is the correct result

Drop the -c flag for h5diff

Tested: linux
This commit is contained in:
Pedro Vicente Nunes
2008-10-17 18:45:32 -05:00
parent 6c262bfc93
commit 1e1bcb801c
20 changed files with 71 additions and 42 deletions

View File

@@ -31,7 +31,7 @@ const char *progname = "h5diff";
* Command-line options: The user can specify short or long-named
* parameters.
*/
static const char *s_opts = "hVrvqn:d:p:c";
static const char *s_opts = "hVrvqn:d:p:";
static struct long_options l_opts[] = {
{ "help", no_arg, 'h' },
{ "version", no_arg, 'V' },
@@ -41,7 +41,6 @@ static struct long_options l_opts[] = {
{ "count", require_arg, 'n' },
{ "delta", require_arg, 'd' },
{ "relative", require_arg, 'p' },
{ "contents", no_arg, 'c' },
{ NULL, 0, '\0' }
};
@@ -56,10 +55,6 @@ static struct long_options l_opts[] = {
void parse_command_line(int argc,
const char* argv[],
const char** fname1,
const char** fname2,
const char** objname1,
const char** objname2,
diff_opt_t* options)
{
@@ -90,10 +85,6 @@ void parse_command_line(int argc,
case 'r':
options->m_report = 1;
break;
case 'c':
/* ignore graph comparison in return value */
options->m_no_contents = 1;
break;
case 'd':
options->d=1;
@@ -304,8 +295,6 @@ void usage(void)
printf(" -r, --report Report mode. Print differences\n");
printf(" -v, --verbose Verbose mode. Print differences, list of objects\n");
printf(" -q, --quiet Quiet mode. Do not do output\n");
printf(" -c, --contents Ignore graph contents differences in return value\n");
printf(" -n C, --count=C Print differences up to C number\n");
printf(" -d D, --delta=D Print difference when greater than limit D\n");