diff --git a/big-tests b/big-tests index e772c1e6..bcec65b5 160000 --- a/big-tests +++ b/big-tests @@ -1 +1 @@ -Subproject commit e772c1e67aba14141dd16735ecdf19368b0cb29e +Subproject commit bcec65b53b8332710f8d74adf4d6a060a91ab5ee diff --git a/doc/manuals/abicompat.rst b/doc/manuals/abicompat.rst index 8f19c433..99e41896 100644 --- a/doc/manuals/abicompat.rst +++ b/doc/manuals/abicompat.rst @@ -131,6 +131,14 @@ Options application but that are removed from the library. That is why it is called ``weak`` mode. + * ``--soname`` + + Specify a shared library name. When the shared libraries versions + are given as ABIXMLs and those XML files contains groups of + corpora, then the shared library name is used to select the right + ABI corpus to be used when checking the ABI compatibility between + the application and the shared library. + .. _abicompat_return_value_label: Return values diff --git a/tests/data/test-abicompat/libtest10-fn-changed.xml b/tests/data/test-abicompat/libtest10-fn-changed.xml new file mode 100644 index 00000000..097af2af --- /dev/null +++ b/tests/data/test-abicompat/libtest10-fn-changed.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/data/test-abicompat/test10-fn-changed-app.xml b/tests/data/test-abicompat/test10-fn-changed-app.xml new file mode 100644 index 00000000..8e5b2728 --- /dev/null +++ b/tests/data/test-abicompat/test10-fn-changed-app.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/data/test-abicompat/test10-fn-changed.txt b/tests/data/test-abicompat/test10-fn-changed.txt new file mode 100644 index 00000000..357b9d75 --- /dev/null +++ b/tests/data/test-abicompat/test10-fn-changed.txt @@ -0,0 +1,15 @@ +Searching for soname libtest-1.so ... found. +functions defined in library 'libtest10-fn-changed.xml' +have sub-types that are different from what application 'test10-fn-changed-app.xml' expects: + + function foo* first_func(void): + return type changed: + in pointed to type 'struct foo' at test1.h:1:1: + type size changed from 32 to 64 (in bits) + 1 data member insertion: + 'char m1', at offset 32 (in bits) at test1.h:4:1 + + function void second_func(foo&): + parameter 1 of type 'foo&' has sub-type changes: + referenced type 'struct foo' changed at test0.h:1:1, as reported earlier + diff --git a/tests/test-abicompat.cc b/tests/test-abicompat.cc index 051cfba4..02ca97c3 100644 --- a/tests/test-abicompat.cc +++ b/tests/test-abicompat.cc @@ -334,6 +334,16 @@ InOutSpec in_out_specs[] = "data/test-abicompat/test10/test10-fn-changed-report-4.txt", "output/test-abicompat/test10/test10-fn-changed-report-4.txt", }, + { + "data/test-abicompat/test10-fn-changed-app.xml", + "data/test-abicompat/libtest10-fn-changed.xml", + "", + "", + "--show-base-names --weak-mode --soname libtest-1.so", + abigail::tools_utils::ABIDIFF_ABI_CHANGE, + "data/test-abicompat/test10-fn-changed.txt", + "output/test-abicompat/test10-fn-changed.txt", + }, // This entry must be the last one. {0, 0, 0, 0, 0, abigail::tools_utils::ABIDIFF_OK, 0, 0} }; diff --git a/tools/abicompat.cc b/tools/abicompat.cc index b3e556dd..9b28d9ad 100644 --- a/tools/abicompat.cc +++ b/tools/abicompat.cc @@ -100,6 +100,7 @@ public: string app_di_root_path; string lib1_di_root_path; string lib2_di_root_path; + string soname; vector suppression_paths; bool display_help; bool display_version; @@ -246,6 +247,7 @@ display_usage(const string& prog_name, ostream& out) << " --redundant display redundant changes (this is the default)\n" << " --weak-mode check compatibility between the application and " "just one version of the library.\n" + << " --soname specify the search so name (only for xml corpus groups)\n" #ifdef WITH_CTF << " --ctf use CTF instead of DWARF in ELF files\n" #endif @@ -274,6 +276,14 @@ parse_command_line(int argc, char* argv[], options& opts) else return false; } + else if (!strcmp(argv[i], "--soname")) + { + if (argc <= i + 1 + || argv[i + 1][0] == '-') + return false; + opts.soname = argv[i + 1]; + ++i; + } else if (!strcmp(argv[i], "--version") || !strcmp(argv[i], "-v")) { @@ -887,8 +897,37 @@ read_corpus(options opts, retval = rdr->read_corpus(status); } break; - case abigail::tools_utils::FILE_TYPE_AR: case abigail::tools_utils::FILE_TYPE_XML_CORPUS_GROUP: + { + if (opts.soname.empty()) + { + cout << "No SONAME provided.\n"; + return NULL; + } + + corpus_group_sptr grp; + rdr = abixml::create_reader(path, env); + assert(rdr); + grp = abixml::read_corpus_group_from_input(*rdr); + cout << "Searching for soname " << opts.soname << " ..."; + for (corpus_group::corpora_type::const_iterator i = + grp->get_corpora().begin(); + i != grp->get_corpora().end(); + ++i) + { + corpus_sptr c = *i; + if (c->get_soname().compare(opts.soname) == 0) + { + cout << " found.\n"; + retval = c; + break; + } + } + if (!retval) + cout << "not found.\n"; + } + break; + case abigail::tools_utils::FILE_TYPE_AR: case abigail::tools_utils::FILE_TYPE_RPM: case abigail::tools_utils::FILE_TYPE_SRPM: case abigail::tools_utils::FILE_TYPE_DEB: