In bidiff, change --no-linkage-names to --no-linkage-name

* tools/bidiff.cc (display_usage): Change--no-linkage-names -o
	--no-linkage-name in the help string.
	(parse_command_line): Adjust the command line parsing accordingly.
	* tests/test-diff-filter.cc (in_out_specs): Adjust.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2014-08-27 15:16:53 +02:00
parent b0ced3261e
commit 83ed508010
2 changed files with 17 additions and 17 deletions

View File

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

View File

@ -105,7 +105,7 @@ display_usage(const string prog_name, ostream& out)
<< " --deleted-vars display deleted global public variables\n" << " --deleted-vars display deleted global public variables\n"
<< " --changed-vars display changed global public variables\n" << " --changed-vars display changed global public variables\n"
<< " --added-vars display added global public variables\n" << " --added-vars display added global public variables\n"
<< " --no-linkage-names do not display linkage names of " << " --no-linkage-name do not display linkage names of "
"added/removed/changed\n" "added/removed/changed\n"
<< " --drop <regex> drop functions and variables matching a regexp\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"
@ -210,7 +210,7 @@ parse_command_line(int argc, char* argv[], options& opts)
opts.show_all_fns = false; opts.show_all_fns = false;
opts.show_all_vars = false; opts.show_all_vars = false;
} }
else if (!strcmp(argv[i], "--no-linkage-names")) else if (!strcmp(argv[i], "--no-linkage-name"))
opts.show_linkage_names = false; opts.show_linkage_names = false;
else if (!strcmp(argv[i], "--drop")) else if (!strcmp(argv[i], "--drop"))
{ {