Wire the --no-show-locs option to abidw

Up until now, the --no-show-locs option only had effect when abidiff
was used with the --abidiff option.  It had no effect on the ABIXML
output of abidw.

This patch changes that to make it so that --no-show-locs avoids
emitting source location to the ABIXML output.

	* doc/manuals/abidw.rst: Update the documentation.
	* tests/test-annotate.cc: Now that --no-show-locs has an effect on
	the ABIXML output, let's not use it here, because it changes the
	output and we don't want that.
	* tools/abidw.cc (display_usage): Fix a typo in the help string.
	(load_corpus_and_write_abixml): Set the "show-locs" option to the
	write_context object that we use.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

diff --git a/doc/manuals/abidw.rst b/doc/manuals/abidw.rst
index e2a7685003f457cee5d879d7c87ed7d43211f7a7..1645134bf6a4b602958b49ac7115ac24f71566e5 100644 (file)
--- a/doc/manuals/abidw.rst
+++ b/doc/manuals/abidw.rst
@@ -146,8 +146,8 @@ Options
 
   * ``--no-show-locs``
 
-   Do not show information about where in the *second shared library*
-   the respective type was changed.
+   In the emitted ABI representation, do not show file, line or column
+   where ABI artifacts are defined.
 
   * ``--check-alternate-debug-info-base-name`` <*elf-path*>
 

diff --git a/tests/test-annotate.cc b/tests/test-annotate.cc
index 565401d67f98b49d0e872c5cfe04d20ea0071aea..c8b970416a937693742cfde1a49291e113d41c56 100644 (file)
--- a/tests/test-annotate.cc
+++ b/tests/test-annotate.cc
@@ -155,7 +155,7 @@ main()
   string abidw;
 
   abidw = string(get_build_dir()) + "/tools/abidw "
-    "--annotate --no-show-locs --no-corpus-path";
+    "--annotate --no-corpus-path";
   for (InOutSpec* s = in_out_specs; s->in_elf_path; ++s)
     {
       in_elf_path = string(get_src_dir()) + "/tests/" + s->in_elf_path;

diff --git a/tools/abidw.cc b/tools/abidw.cc
index 1ecda80e41b0910dc578483317a076f8cb30fd2f..87cd269c8688f52c58271003571cf95b17fef1d6 100644 (file)
--- a/tools/abidw.cc
+++ b/tools/abidw.cc
@@ -136,7 +136,7 @@ display_usage(const string& prog_name, ostream& out)
     << "  --suppressions|--suppr <path> specify a suppression file\n"
     << "  --no-architecture  do not emit architecture info in the output\n"
     << "  --no-corpus-path  do not take the path to the corpora into account\n"
-    << "  --no-show-locs  do now show location information\n"
+    << "  --no-show-locs  do not show location information\n"
     << "  --check-alternate-debug-info <elf-path>  check alternate debug info "
     "of <elf-path>\n"
     << "  --check-alternate-debug-info-base-name <elf-path>  check alternate "
@@ -474,6 +474,7 @@ load_corpus_and_write_abixml(char* argv[],
          abigail::xml_writer::write_context_sptr write_ctxt =
            abigail::xml_writer::create_write_context(corp->get_environment(),
                                                      of);
+         abigail::xml_writer::set_show_locs(*write_ctxt, opts.show_locs);
          abigail::xml_writer::set_annotate(*write_ctxt, opts.annotate);
          abigail::xml_writer::write_corpus(corp, 0, *write_ctxt);
          of.close();
@@ -484,6 +485,7 @@ load_corpus_and_write_abixml(char* argv[],
          abigail::xml_writer::write_context_sptr write_ctxt =
            abigail::xml_writer::create_write_context(corp->get_environment(),
                                                      cout);
+         abigail::xml_writer::set_show_locs(*write_ctxt, opts.show_locs);
          abigail::xml_writer::set_annotate(*write_ctxt, opts.annotate);
          exit_code = !abigail::xml_writer::write_corpus(corp, 0, *write_ctxt);
        }