From: Matthias Maennich <maennich@google.com>
To: libabigail@sourceware.org
Cc: dodji@seketeli.org, gprocida@google.com, kernel-team@android.com,
maennich@google.com
Subject: [PATCH 16/20] test-symtab: add tests for whitelisted functions
Date: Wed, 27 Jan 2021 12:58:49 +0000 [thread overview]
Message-ID: <20210127125853.886677-17-maennich@google.com> (raw)
In-Reply-To: <20210127125853.886677-1-maennich@google.com>
Extend the test functionality in test-symtab to allow processing of KMI
whitelists and add additional test cases for whitelist handling.
* tests/data/Makefile.am: add new test files
* tests/data/test-symtab/basic/one_function_one_variable_all.whitelist: New test file,
* tests/data/test-symtab/basic/one_function_one_variable_function.whitelist: Likewise.
* tests/data/test-symtab/basic/one_function_one_variable_irrelevant.whitelist: Likewise.
* tests/data/test-symtab/basic/one_function_one_variable_variable.whitelist: Likewise.
* tests/test-symtab.cc (read_corpus): Add support for whitelists.
(assert_symbol_count): Likewise.
(Symtab::SymtabWithWhitelist): New testcase.
Reviewed-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
---
tests/data/Makefile.am | 4 +
.../one_function_one_variable_all.whitelist | 3 +
...e_function_one_variable_function.whitelist | 2 +
...function_one_variable_irrelevant.whitelist | 2 +
...e_function_one_variable_variable.whitelist | 2 +
tests/test-symtab.cc | 103 ++++++++++++++++--
6 files changed, 109 insertions(+), 7 deletions(-)
create mode 100644 tests/data/test-symtab/basic/one_function_one_variable_all.whitelist
create mode 100644 tests/data/test-symtab/basic/one_function_one_variable_function.whitelist
create mode 100644 tests/data/test-symtab/basic/one_function_one_variable_irrelevant.whitelist
create mode 100644 tests/data/test-symtab/basic/one_function_one_variable_variable.whitelist
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a23dbc6343fa..42a94f62f67d 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1861,6 +1861,10 @@ test-symtab/basic/no_debug_info.c \
test-symtab/basic/no_debug_info.so \
test-symtab/basic/one_function_one_variable.c \
test-symtab/basic/one_function_one_variable.so \
+test-symtab/basic/one_function_one_variable_variable.whitelist \
+test-symtab/basic/one_function_one_variable_function.whitelist \
+test-symtab/basic/one_function_one_variable_irrelevant.whitelist \
+test-symtab/basic/one_function_one_variable_all.whitelist \
test-symtab/basic/one_function_one_variable_undefined.c \
test-symtab/basic/one_function_one_variable_undefined.so \
test-symtab/basic/single_function.c \
diff --git a/tests/data/test-symtab/basic/one_function_one_variable_all.whitelist b/tests/data/test-symtab/basic/one_function_one_variable_all.whitelist
new file mode 100644
index 000000000000..02ea310960ff
--- /dev/null
+++ b/tests/data/test-symtab/basic/one_function_one_variable_all.whitelist
@@ -0,0 +1,3 @@
+[abi_whitelist]
+ exported_function
+ exported_variable
diff --git a/tests/data/test-symtab/basic/one_function_one_variable_function.whitelist b/tests/data/test-symtab/basic/one_function_one_variable_function.whitelist
new file mode 100644
index 000000000000..893accc14118
--- /dev/null
+++ b/tests/data/test-symtab/basic/one_function_one_variable_function.whitelist
@@ -0,0 +1,2 @@
+[abi_whitelist]
+ exported_function
diff --git a/tests/data/test-symtab/basic/one_function_one_variable_irrelevant.whitelist b/tests/data/test-symtab/basic/one_function_one_variable_irrelevant.whitelist
new file mode 100644
index 000000000000..180ef9064e8f
--- /dev/null
+++ b/tests/data/test-symtab/basic/one_function_one_variable_irrelevant.whitelist
@@ -0,0 +1,2 @@
+[abi_whitelist]
+ irrelevant
diff --git a/tests/data/test-symtab/basic/one_function_one_variable_variable.whitelist b/tests/data/test-symtab/basic/one_function_one_variable_variable.whitelist
new file mode 100644
index 000000000000..49d838f2c559
--- /dev/null
+++ b/tests/data/test-symtab/basic/one_function_one_variable_variable.whitelist
@@ -0,0 +1,2 @@
+[abi_whitelist]
+ exported_variable
diff --git a/tests/test-symtab.cc b/tests/test-symtab.cc
index 2df766de1c5c..ac853e895fef 100644
--- a/tests/test-symtab.cc
+++ b/tests/test-symtab.cc
@@ -11,11 +11,14 @@
#include <iostream>
#include <limits>
+#include <string>
#include <vector>
#include "abg-corpus.h"
#include "abg-dwarf-reader.h"
+#include "abg-fwd.h"
#include "abg-ir.h"
+#include "abg-tools-utils.h"
#include "lib/catch.hpp"
#include "test-utils.h"
@@ -26,12 +29,16 @@ using dwarf_reader::read_context_sptr;
using dwarf_reader::read_corpus_from_elf;
using ir::environment;
using ir::environment_sptr;
+using suppr::suppressions_type;
static const std::string test_data_dir =
std::string(abigail::tests::get_src_dir()) + "/tests/data/test-symtab/";
dwarf_reader::status
-read_corpus(const std::string path, corpus_sptr& result)
+read_corpus(
+ const std::string& path,
+ corpus_sptr& result,
+ const std::vector<std::string>& whitelist_paths = std::vector<std::string>())
{
const std::string& absolute_path = test_data_dir + path;
@@ -41,6 +48,15 @@ read_corpus(const std::string path, corpus_sptr& result)
absolute_path, debug_info_root_paths, env.get(),
/* load_all_type = */ true, /* linux_kernel_mode = */ true);
+ if (!whitelist_paths.empty())
+ {
+ const suppressions_type& wl_suppr =
+ tools_utils::gen_suppr_spec_from_kernel_abi_whitelists(
+ whitelist_paths);
+ REQUIRE_FALSE(wl_suppr.empty());
+ dwarf_reader::add_read_context_suppressions(*ctxt, wl_suppr);
+ }
+
dwarf_reader::status status = dwarf_reader::STATUS_UNKNOWN;
result = read_corpus_from_elf(*ctxt, status);
@@ -76,14 +92,17 @@ TEST_CASE("Symtab::NoDebugInfo", "[symtab, basic]")
#define N std::numeric_limits<size_t>::max()
corpus_sptr
-assert_symbol_count(const std::string& path,
- size_t function_symbols = 0,
- size_t variable_symbols = 0,
- size_t undefined_function_symbols = 0,
- size_t undefined_variable_symbols = 0)
+assert_symbol_count(
+ const std::string& path,
+ size_t function_symbols = 0,
+ size_t variable_symbols = 0,
+ size_t undefined_function_symbols = 0,
+ size_t undefined_variable_symbols = 0,
+ const std::vector<std::string>& whitelist_paths = std::vector<std::string>())
{
corpus_sptr corpus_ptr;
- const dwarf_reader::status status = read_corpus(path, corpus_ptr);
+ const dwarf_reader::status status =
+ read_corpus(path, corpus_ptr, whitelist_paths);
REQUIRE(corpus_ptr);
REQUIRE((status & dwarf_reader::STATUS_OK));
@@ -188,6 +207,76 @@ TEST_CASE("Symtab::SimpleSymtabs", "[symtab, basic]")
}
}
+TEST_CASE("Symtab::SymtabWithWhitelist", "[symtab, whitelist]")
+{
+ GIVEN("a binary with one function and one variable exported")
+ {
+ const std::string binary = "basic/one_function_one_variable.so";
+
+ GIVEN("we read the binary without any whitelists")
+ {
+ const corpus_sptr& corpus = assert_symbol_count(binary, 1, 1);
+ CHECK(corpus->lookup_function_symbol("exported_function"));
+ CHECK(!corpus->lookup_variable_symbol("exported_function"));
+ CHECK(corpus->lookup_variable_symbol("exported_variable"));
+ CHECK(!corpus->lookup_function_symbol("exported_variable"));
+ }
+
+ GIVEN("we read the binary with all symbols on the whitelists")
+ {
+ std::vector<std::string> whitelists;
+ whitelists.push_back(test_data_dir
+ + "basic/one_function_one_variable_all.whitelist");
+ const corpus_sptr& corpus =
+ assert_symbol_count(binary, 1, 1, 0, 0, whitelists);
+ CHECK(corpus->lookup_function_symbol("exported_function"));
+ CHECK(!corpus->lookup_variable_symbol("exported_function"));
+ CHECK(corpus->lookup_variable_symbol("exported_variable"));
+ CHECK(!corpus->lookup_function_symbol("exported_variable"));
+ }
+
+ GIVEN("we read the binary with only irrelevant symbols whitelisted")
+ {
+ std::vector<std::string> whitelists;
+ whitelists.push_back(
+ test_data_dir
+ + "basic/one_function_one_variable_irrelevant.whitelist");
+
+ corpus_sptr corpus_ptr;
+ const dwarf_reader::status status =
+ read_corpus(binary, corpus_ptr, whitelists);
+ REQUIRE(!corpus_ptr);
+ REQUIRE((status & dwarf_reader::STATUS_NO_SYMBOLS_FOUND));
+ }
+
+ GIVEN("we read the binary with only the function whitelisted")
+ {
+ std::vector<std::string> whitelists;
+ whitelists.push_back(
+ test_data_dir + "basic/one_function_one_variable_function.whitelist");
+ const corpus_sptr& corpus =
+ assert_symbol_count(binary, 1, 0, 0, 0, whitelists);
+ CHECK(corpus->lookup_function_symbol("exported_function"));
+ CHECK(!corpus->lookup_variable_symbol("exported_function"));
+ CHECK(!corpus->lookup_variable_symbol("exported_variable"));
+ CHECK(!corpus->lookup_function_symbol("exported_variable"));
+ }
+
+ GIVEN("we read the binary with only the variable whitelisted")
+ {
+ std::vector<std::string> whitelists;
+ whitelists.push_back(
+ test_data_dir + "basic/one_function_one_variable_variable.whitelist");
+ const corpus_sptr& corpus =
+ assert_symbol_count(binary, 0, 1, 0, 0, whitelists);
+ CHECK(!corpus->lookup_function_symbol("exported_function"));
+ CHECK(!corpus->lookup_variable_symbol("exported_function"));
+ CHECK(corpus->lookup_variable_symbol("exported_variable"));
+ CHECK(!corpus->lookup_function_symbol("exported_variable"));
+ }
+ }
+}
+
static const char* kernel_versions[] = { "4.14", "4.19", "5.4", "5.6" };
static const size_t nr_kernel_versions =
sizeof(kernel_versions) / sizeof(kernel_versions[0]);
--
2.30.0.280.ga3ce27912f-goog
next prev parent reply other threads:[~2021-01-27 12:59 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 21:42 [PATCH v1 00/16] Refactor (k)symtab reader Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 01/16] abg-cxx-compat: add simplified version of std::optional Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 02/16] abg-cxx-compat: more <functional> support: std::bind and friends Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 03/16] abg-ir: elf_symbol: add is_in_ksymtab field Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 04/16] abg-ir: elf_symbol: add is_suppressed field Matthias Maennich
2020-06-22 9:46 ` Giuliano Procida
2020-06-19 21:42 ` [PATCH v1 05/16] dwarf-reader split: create abg-symtab-reader.{h, cc} and test case Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 06/16] Refactor ELF symbol table reading by adding a new symtab reader Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 07/16] Integrate new symtab reader into corpus and read_context Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 08/16] corpus: make get_(undefined_)?_(var|fun)_symbols use the new symtab Matthias Maennich
2020-06-22 9:53 ` Giuliano Procida
2020-06-19 21:42 ` [PATCH v1 09/16] corpus: make get_unreferenced_(function|variable)_symbols " Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 10/16] abg-reader: avoid using the (var|function)_symbol_map Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 11/16] dwarf-reader: read_context: use new symtab in *_symbols_is_exported Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 12/16] Switch kernel stuff over to new symtab and drop unused code Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 13/16] abg-elf-helpers: migrate ppc64 specific helpers Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 14/16] symtab_reader: add support for ppc64 ELFv1 binaries Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 15/16] abg-corpus: remove symbol maps and their setters Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 16/16] dwarf reader: drop (now) unused code related symbol table reading Matthias Maennich
2020-06-22 9:56 ` Giuliano Procida
2020-07-03 16:46 ` [PATCH v2 00/21] Refactor (k)symtab reader Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 01/21] abg-cxx-compat: add simplified version of std::optional Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 02/21] abg-cxx-compat: more <functional> support: std::bind and friends Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 03/21] abg-ir: elf_symbol: add is_in_ksymtab field Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 04/21] abg-ir: elf_symbol: add is_suppressed field Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 05/21] dwarf-reader split: create abg-symtab-reader.{h, cc} and test case Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 06/21] Refactor ELF symbol table reading by adding a new symtab reader Matthias Maennich
2020-07-20 15:39 ` Dodji Seketeli
2020-07-03 16:46 ` [PATCH v2 07/21] Integrate new symtab reader into corpus and read_context Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 08/21] corpus: make get_(undefined_)?_(var|fun)_symbols use the new symtab Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 09/21] corpus: make get_unreferenced_(function|variable)_symbols " Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 10/21] abg-reader: avoid using the (var|function)_symbol_map Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 11/21] dwarf-reader: read_context: use new symtab in *_symbols_is_exported Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 12/21] Switch kernel stuff over to new symtab and drop unused code Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 13/21] abg-elf-helpers: migrate ppc64 specific helpers Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 14/21] symtab_reader: add support for ppc64 ELFv1 binaries Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 15/21] abg-corpus: remove symbol maps and their setters Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 16/21] dwarf reader: drop now-unused code related to symbol table reading Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 17/21] test-symtab: add tests for whitelisted functions Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 18/21] symtab/dwarf-reader: allow hinting of main symbols for aliases Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 19/21] dwarf-reader/writer: consider aliases when dealing with suppressions Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 20/21] symtab: Add support for MODVERSIONS (CRC checksums) Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 21/21] reader/symtab: Improve handling for suppressed aliases Matthias Maennich
2020-07-20 14:27 ` [PATCH v2 00/21] Refactor (k)symtab reader Dodji Seketeli
2021-01-27 12:58 ` [PATCH 00/20] " Matthias Maennich
2021-01-27 12:58 ` [PATCH 01/20] abg-cxx-compat: add simplified version of std::optional Matthias Maennich
2021-03-09 9:43 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 02/20] abg-ir: elf_symbol: add is_in_ksymtab field Matthias Maennich
2021-03-09 14:05 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 03/20] abg-ir: elf_symbol: add is_suppressed field Matthias Maennich
2021-03-09 18:03 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 04/20] dwarf-reader split: create abg-symtab-reader.{h, cc} and test case Matthias Maennich
2021-03-10 18:00 ` [PATCH 04/20] dwarf-reader split: create abg-symtab-reader.{h,cc} " Dodji Seketeli
2021-01-27 12:58 ` [PATCH 05/20] Refactor ELF symbol table reading by adding a new symtab reader Matthias Maennich
2021-03-12 11:18 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 06/20] Integrate new symtab reader into corpus and read_context Matthias Maennich
2021-03-12 15:04 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 07/20] corpus: make get_(undefined_)?_(var|fun)_symbols use the new symtab Matthias Maennich
2021-03-15 10:05 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 08/20] corpus: make get_unreferenced_(function|variable)_symbols " Matthias Maennich
2021-03-15 12:06 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 09/20] abg-reader: avoid using the (var|function)_symbol_map Matthias Maennich
2021-03-15 14:23 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 10/20] dwarf-reader: read_context: use new symtab in *_symbols_is_exported Matthias Maennich
2021-03-15 18:13 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 11/20] Switch kernel stuff over to new symtab and drop unused code Matthias Maennich
2021-03-16 10:38 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 12/20] abg-elf-helpers: migrate ppc64 specific helpers Matthias Maennich
2021-03-16 10:59 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 13/20] symtab_reader: add support for ppc64 ELFv1 binaries Matthias Maennich
2021-03-16 11:39 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 14/20] abg-corpus: remove symbol maps and their setters Matthias Maennich
2021-03-16 18:08 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 15/20] dwarf reader: drop (now) unused code related to symbol table reading Matthias Maennich
2021-03-16 18:42 ` Dodji Seketeli
2021-01-27 12:58 ` Matthias Maennich [this message]
2021-03-17 11:07 ` [PATCH 16/20] test-symtab: add tests for whitelisted functions Dodji Seketeli
2021-01-27 12:58 ` [PATCH 17/20] symtab/dwarf-reader: allow hinting of main symbols for aliases Matthias Maennich
2021-03-17 13:40 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 18/20] dwarf-reader/writer: consider aliases when dealing with suppressions Matthias Maennich
2021-03-17 15:44 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 19/20] abg-writer.cc: fix write_elf_symbol_reference loop Matthias Maennich
2021-03-17 16:11 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 20/20] symtab: Add support for MODVERSIONS (CRC checksums) Matthias Maennich
2021-03-17 17:13 ` Dodji Seketeli
2021-03-17 23:29 ` Giuliano Procida
2021-03-18 22:10 ` Matthias Maennich
2021-03-19 16:55 ` Dodji Seketeli
2021-03-19 18:15 ` Dodji Seketeli
2021-03-29 13:19 ` [GIT PULL] Refactor (k)symtab reader Matthias Maennich
2021-04-02 14:28 ` Dodji Seketeli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210127125853.886677-17-maennich@google.com \
--to=maennich@google.com \
--cc=dodji@seketeli.org \
--cc=gprocida@google.com \
--cc=kernel-team@android.com \
--cc=libabigail@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).