Make bidiff filter output and display symbol names by default

* tools/bidiff.cc (options::options): Initialize
	options::show_linkage_names to true and
	options::show_harmful_changes to false.
	(parse_command_line): Change --linkage-names into
	--no-linkage-names as the linkage names are now displayed by
	default.  Change --no-harmless into --harmless as harmless changes
	are now filtered by default.
	(display_usage): Update help string for the --linkage-names ->
	--no-linkage-names and --no-harmful -> --harmful change.
	* tests/test-diff-filter.cc: Adjust.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2014-05-30 09:17:17 +02:00
parent 76bfae5aac
commit 9ed00db0a2
2 changed files with 24 additions and 23 deletions

View File

@ -57,105 +57,105 @@ InOutSpec in_out_specs[] =
{
"data/test-diff-filter/test0-v0.o",
"data/test-diff-filter/test0-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test0-report.txt",
"output/test-diff-filter/test0-report.txt",
},
{
"data/test-diff-filter/test0-v0.o",
"data/test-diff-filter/test0-v1.o",
"",
"--harmless --no-linkage-names",
"data/test-diff-filter/test01-report.txt",
"output/test-diff-filter/test01-report.txt",
},
{
"data/test-diff-filter/test1-v0.o",
"data/test-diff-filter/test1-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test1-report.txt",
"output/test-diff-filter/test1-report.txt",
},
{
"data/test-diff-filter/test2-v0.o",
"data/test-diff-filter/test2-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test2-report.txt",
"output/test-diff-filter/test2-report.txt",
},
{
"data/test-diff-filter/test3-v0.o",
"data/test-diff-filter/test3-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test3-report.txt",
"output/test-diff-filter/test3-report.txt",
},
{
"data/test-diff-filter/test4-v0.o",
"data/test-diff-filter/test4-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test4-report.txt",
"output/test-diff-filter/test4-report.txt",
},
{
"data/test-diff-filter/test5-v0.o",
"data/test-diff-filter/test5-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test5-report.txt",
"output/test-diff-filter/test5-report.txt",
},
{
"data/test-diff-filter/test6-v0.o",
"data/test-diff-filter/test6-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test6-report.txt",
"output/test-diff-filter/test6-report.txt",
},
{
"data/test-diff-filter/test7-v0.o",
"data/test-diff-filter/test7-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test7-report.txt",
"output/test-diff-filter/test7-report.txt",
},
{
"data/test-diff-filter/test8-v0.o",
"data/test-diff-filter/test8-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test8-report.txt",
"output/test-diff-filter/test8-report.txt",
},
{
"data/test-diff-filter/test9-v0.o",
"data/test-diff-filter/test9-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test9-report.txt",
"output/test-diff-filter/test9-report.txt",
},
{
"data/test-diff-filter/test10-v0.o",
"data/test-diff-filter/test10-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test10-report.txt",
"output/test-diff-filter/test10-report.txt",
},
{
"data/test-diff-filter/test11-v0.o",
"data/test-diff-filter/test11-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test11-report.txt",
"output/test-diff-filter/test11-report.txt",
},
{
"data/test-diff-filter/test12-v0.o",
"data/test-diff-filter/test12-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test12-report.txt",
"output/test-diff-filter/test12-report.txt",
},
{
"data/test-diff-filter/test13-v0.o",
"data/test-diff-filter/test13-v1.o",
"--no-harmless",
"--no-linkage-names",
"data/test-diff-filter/test13-report.txt",
"output/test-diff-filter/test13-report.txt",
},

View File

@ -80,9 +80,9 @@ struct options
show_changed_vars(false),
show_added_vars(false),
show_all_vars(true),
show_linkage_names(false),
show_linkage_names(true),
show_harmful_changes(true),
show_harmless_changes(true),
show_harmless_changes(false),
di_root_path1(0),
di_root_path2(0)
{}
@ -103,7 +103,8 @@ display_usage(const string prog_name, ostream& out)
<< " --deleted-vars display deleted global public variables\n"
<< " --changed-vars display changed global public variables\n"
<< " --added-vars display added global public variables\n"
<< " --linkage-names display linkage names of added/removed/changed\n"
<< " --no-linkage-names do not display linkage names of "
"added/removed/changed\n"
<< " --drop <regex> drop functions and variables matching a regexp\n"
<< " --drop-fn <regex> drop functions matching a regexp\n"
<< " --drop-fn <regex> drop functions matching a regexp\n"
@ -112,7 +113,7 @@ display_usage(const string prog_name, ostream& out)
<< " --keep-fn <regex> keep only functions matching a regex\n"
<< " --keep-var <regex> keep only variables matching a regex\n"
<< " --no-harmless do not display the harmless changes\n"
<< " --no-harmful do not display the harmful changes\n"
<< " --harmful display the harmful changes\n"
<< " --help display this message\n";
}
@ -202,8 +203,8 @@ parse_command_line(int argc, char* argv[], options& opts)
opts.show_all_fns = false;
opts.show_all_vars = false;
}
else if (!strcmp(argv[i], "--linkage-names"))
opts.show_linkage_names = true;
else if (!strcmp(argv[i], "--no-linkage-names"))
opts.show_linkage_names = false;
else if (!strcmp(argv[i], "--drop"))
{
int j = i + 1;
@ -252,8 +253,8 @@ parse_command_line(int argc, char* argv[], options& opts)
return false;
opts.keep_var_regex_patterns.push_back(argv[j]);
}
else if (!strcmp(argv[i], "--no-harmless"))
opts.show_harmless_changes = false;
else if (!strcmp(argv[i], "--harmless"))
opts.show_harmless_changes = true;
else if (!strcmp(argv[i], "--no-harmful"))
opts.show_harmful_changes = false;
else