libabigail/tests/test-kmi-whitelist.cc

130 lines
4.3 KiB
C++
Raw Normal View History

Re-license the project to Apache v2 With LLVM Exception Thanks to the previous work done, changing the license is just a matter of changing the SPDX identifer from "LGPL-3.0-or-later" to "Apache-2.0 WITH LLVM-exception". Note that for the abigail.m4, tests/test-dot.cc and tests/test-svg.cc the change was from "GPL-3.0-or-later WITH GCC-exception-3.1" to "Apache-2.0 WITH LLVM-exception". include/abg-cxx-compat.h was changed from "LGPL-2.0-or-later" to "Apache-2.0 WITH LLVM-exception". Source code of programs (as opposed to source code of the library) where generally licensed under GPL-3.0-or-later; they are also now licensed "Apache-2.0 WITH LLVM-exception". This is what this patch does. * abigail.m4: Change the SPDX identifier from "GPL-3.0-or-later WITH GCC-exception-3.1" to "Apache-2.0 WITH LLVM-exception" * include/abg-cxx-compat.h: Change the SPDX identifier from "LGPL-2.0-or-later" to "Apache-2.0 WITH LLVM-exception". * .clang-format: Change the SPDX identifier from "LGPL-3.0-or-later" to "Apache-2.0 WITH LLVM-exception". * Makefile.am: Likewise. * bash-completion/Makefile.am: Likewise. * bash-completion/abicompat: Likewise. * bash-completion/abidiff: Likewise. * bash-completion/abidw: Likewise. * bash-completion/abilint: Likewise. * bash-completion/abinilint: Likewise. * bash-completion/abipkgdiff: Likewise. * bash-completion/abisym: Likewise. * bash-completion/fedabipkgdiff: Likewise. * configure.ac: Likewise. * default.abignore: Likewise. * doc/Makefile.am: Likewise. * doc/api/libabigail.doxy: Likewise. * doc/manuals/Makefile.am: Likewise. * doc/website/libabigail-website.doxy: Likewise. * include/Makefile.am: Likewise. * include/abg-comp-filter.h: Likewise. * include/abg-comparison.h: Likewise. * include/abg-config.h: Likewise. * include/abg-corpus.h: Likewise. * include/abg-diff-utils.h: Likewise. * include/abg-dwarf-reader.h: Likewise. * include/abg-fwd.h: Likewise. * include/abg-hash.h: Likewise. * include/abg-ini.h: Likewise. * include/abg-interned-str.h: Likewise. * include/abg-ir.h: Likewise. * include/abg-libxml-utils.h: Likewise. * include/abg-libzip-utils.h: Likewise. * include/abg-reader.h: Likewise. * include/abg-regex.h: Likewise. * include/abg-reporter.h: Likewise. * include/abg-sptr-utils.h: Likewise. * include/abg-suppression.h: Likewise. * include/abg-tools-utils.h: Likewise. * include/abg-traverse.h: Likewise. * include/abg-version.h.in: Likewise. * include/abg-viz-common.h: Likewise. * include/abg-viz-dot.h: Likewise. * include/abg-viz-svg.h: Likewise. * include/abg-workers.h: Likewise. * include/abg-writer.h: Likewise. * scripts/dot_to_png.sh: Likewise. * scripts/dot_to_svg.sh: Likewise. * scripts/make-verbose.sh: Likewise. * scripts/svg_to_plain_svg.sh: Likewise. * scripts/svg_to_png_and_pdf.sh: Likewise. * src/Makefile.am: Likewise. * src/abg-comp-filter.cc: Likewise. * src/abg-comparison-priv.h: Likewise. * src/abg-comparison.cc: Likewise. * src/abg-config.cc: Likewise. * src/abg-corpus-priv.h: Likewise. * src/abg-corpus.cc: Likewise. * src/abg-default-reporter.cc: Likewise. * src/abg-diff-utils.cc: Likewise. * src/abg-dwarf-reader.cc: Likewise. * src/abg-elf-helpers.cc: Likewise. * src/abg-elf-helpers.h: Likewise. * src/abg-hash.cc: Likewise. * src/abg-ini.cc: Likewise. * src/abg-internal.h: Likewise. * src/abg-ir-priv.h: Likewise. * src/abg-ir.cc: Likewise. * src/abg-leaf-reporter.cc: Likewise. * src/abg-libxml-utils.cc: Likewise. * src/abg-libzip-utils.cc: Likewise. * src/abg-reader.cc: Likewise. * src/abg-regex.cc: Likewise. * src/abg-reporter-priv.cc: Likewise. * src/abg-reporter-priv.h: Likewise. * src/abg-suppression-priv.h: Likewise. * src/abg-suppression.cc: Likewise. * src/abg-tools-utils.cc: Likewise. * src/abg-traverse.cc: Likewise. * src/abg-viz-common.cc: Likewise. * src/abg-viz-dot.cc: Likewise. * src/abg-viz-svg.cc: Likewise. * src/abg-workers.cc: Likewise. * src/abg-writer.cc: Likewise. * tests/Makefile.am: Likewise. * tests/data/Makefile.am: Likewise. * tests/lib/catch.cc: Likewise. * tests/mockfedabipkgdiff.in: Likewise. * tests/print-diff-tree.cc: Likewise. * tests/runtestcanonicalizetypes.sh.in: Likewise. * tests/runtestdefaultsupprs.py.in: Likewise. * tests/runtestdefaultsupprspy3.sh.in: Likewise. * tests/runtestfedabipkgdiff.py.in: Likewise. * tests/runtestfedabipkgdiffpy3.sh.in: Likewise. * tests/test-abicompat.cc: Likewise. * tests/test-abidiff-exit.cc: Likewise. * tests/test-abidiff.cc: Likewise. * tests/test-alt-dwarf-file.cc: Likewise. * tests/test-annotate.cc: Likewise. * tests/test-core-diff.cc: Likewise. * tests/test-cxx-compat.cc: Likewise. * tests/test-diff-dwarf-abixml.cc: Likewise. * tests/test-diff-dwarf.cc: Likewise. * tests/test-diff-filter.cc: Likewise. * tests/test-diff-pkg.cc: Likewise. * tests/test-diff-suppr.cc: Likewise. * tests/test-diff2.cc: Likewise. * tests/test-dot.cc: Change the SPDX identifier from "GPL-3.0-or-later WITH GCC-exception-3.1" to "Apache-2.0 WITH LLVM-exception" * tests/test-elf-helpers.cc: Change the SPDX identifier from "LGPL-3.0-or-later" to "Apache-2.0 WITH LLVM-exception" * tests/test-ini.cc: Likewise. * tests/test-ir-walker.cc: Likewise. * tests/test-kmi-whitelist.cc: Likewise. * tests/test-lookup-syms.cc: Likewise. * tests/test-read-dwarf.cc: Likewise. * tests/test-read-write.cc: Likewise. * tests/test-svg.cc: Change the SPDX identifier from "GPL-3.0-or-later WITH GCC-exception-3.1" to "Apache-2.0 WITH LLVM-exception". * tests/test-symtab.cc: Change the SPDX identifier from "LGPL-3.0-or-later" to "Apache-2.0 WITH LLVM-exception" * tests/test-tools-utils.cc: Likewise. * tests/test-types-stability.cc: Likewise. * tests/test-utils.cc: Likewise. * tests/test-utils.h: Likewise. * tests/test-write-read-archive.cc: Likewise. * tests/update-test-output.py: Likewise. * tools/Makefile.am: Likewise. * tools/abiar.cc: Likewise. * tools/abicompat.cc: Likewise. * tools/abidiff.cc: Likewise. * tools/abidw.cc: Likewise. * tools/abilint.cc: Likewise. * tools/abipkgdiff.cc: Likewise. * tools/abisym.cc: Likewise. * tools/binilint.cc: Likewise. * tools/fedabipkgdiff: Likewise. * tools/kmidiff.cc: Likewise. * update-copyright.sh: Likewise. Signed-off-by: Benjamin De Kosnik <bkoz@gnu.org> Signed-off-by: Ben Woodard <woodard@redhat.com> Signed-off-by: Chenxiong Qi <cqi@redhat.com> Signed-off-by: Dodji Seketeli <dodji@redhat.com> Signed-off-by: Giuliano Procida <gprocida@google.com> Signed-off-by: Jan Engelhardt <jengelh@inai.de> Signed-off-by: Jessica Yu <jeyu@kernel.org> Signed-off-by: Jonathan Wakely <jwakely@redhat.com> Signed-off-by: Mark Wielaard <mark@klomp.org> Signed-off-by: Matthias Klose <doko@ubuntu.com> Signed-off-by: Matthias Maennich <maennich@google.com> Signed-off-by: Ondrej Oprala <ondrej.oprala@gmail.com> Signed-off-by: Roland McGrath <roland@hack.frob.com> Signed-off-by: Sinny Kumari <ksinny@gmail.com> Signed-off-by: Slava Barinov <v.barinov@samsung.com>
2020-05-29 14:26:04 +00:00
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
// -*- Mode: C++ -*-
//
Update copyright year for 2023 Update the copyright years for 2023, using the script update-copyright.sh. * update-copyright.sh: Update the copyright years in this script. * include/abg-comp-filter.h: Update copyright year for 2023. * include/abg-comparison.h: Likewise. * include/abg-config.h: Likewise. * include/abg-corpus.h: Likewise. * include/abg-ctf-reader.h: Likewise. * include/abg-cxx-compat.h: Likewise. * include/abg-diff-utils.h: Likewise. * include/abg-dwarf-reader.h: Likewise. * include/abg-elf-based-reader.h: Likewise. * include/abg-elf-reader.h: Likewise. * include/abg-fe-iface.h: Likewise. * include/abg-fwd.h: Likewise. * include/abg-hash.h: Likewise. * include/abg-ini.h: Likewise. * include/abg-interned-str.h: Likewise. * include/abg-ir.h: Likewise. * include/abg-libxml-utils.h: Likewise. * include/abg-reader.h: Likewise. * include/abg-regex.h: Likewise. * include/abg-reporter.h: Likewise. * include/abg-sptr-utils.h: Likewise. * include/abg-suppression.h: Likewise. * include/abg-tools-utils.h: Likewise. * include/abg-traverse.h: Likewise. * include/abg-viz-common.h: Likewise. * include/abg-viz-dot.h: Likewise. * include/abg-viz-svg.h: Likewise. * include/abg-workers.h: Likewise. * include/abg-writer.h: Likewise. * src/abg-comp-filter.cc: Likewise. * src/abg-comparison-priv.h: Likewise. * src/abg-comparison.cc: Likewise. * src/abg-config.cc: Likewise. * src/abg-corpus-priv.h: Likewise. * src/abg-corpus.cc: Likewise. * src/abg-ctf-reader.cc: Likewise. * src/abg-default-reporter.cc: Likewise. * src/abg-diff-utils.cc: Likewise. * src/abg-dwarf-reader.cc: Likewise. * src/abg-elf-based-reader.cc: Likewise. * src/abg-elf-helpers.cc: Likewise. * src/abg-elf-helpers.h: Likewise. * src/abg-elf-reader.cc: Likewise. * src/abg-fe-iface.cc: Likewise. * src/abg-hash.cc: Likewise. * src/abg-ini.cc: Likewise. * src/abg-internal.h: Likewise. * src/abg-ir-priv.h: Likewise. * src/abg-ir.cc: Likewise. * src/abg-leaf-reporter.cc: Likewise. * src/abg-libxml-utils.cc: Likewise. * src/abg-reader.cc: Likewise. * src/abg-regex.cc: Likewise. * src/abg-reporter-priv.cc: Likewise. * src/abg-reporter-priv.h: Likewise. * src/abg-suppression-priv.h: Likewise. * src/abg-suppression.cc: Likewise. * src/abg-symtab-reader.cc: Likewise. * src/abg-symtab-reader.h: Likewise. * src/abg-tools-utils.cc: Likewise. * src/abg-traverse.cc: Likewise. * src/abg-viz-common.cc: Likewise. * src/abg-viz-dot.cc: Likewise. * src/abg-viz-svg.cc: Likewise. * src/abg-workers.cc: Likewise. * src/abg-writer.cc: Likewise. * tests/print-diff-tree.cc: Likewise. * tests/test-abicompat.cc: Likewise. * tests/test-abidiff-exit.cc: Likewise. * tests/test-abidiff.cc: Likewise. * tests/test-alt-dwarf-file.cc: Likewise. * tests/test-core-diff.cc: Likewise. * tests/test-cxx-compat.cc: Likewise. * tests/test-diff-dwarf-abixml.cc: Likewise. * tests/test-diff-dwarf.cc: Likewise. * tests/test-diff-filter.cc: Likewise. * tests/test-diff-pkg.cc: Likewise. * tests/test-diff-suppr.cc: Likewise. * tests/test-diff2.cc: Likewise. * tests/test-dot.cc: Likewise. * tests/test-elf-helpers.cc: Likewise. * tests/test-ini.cc: Likewise. * tests/test-ir-walker.cc: Likewise. * tests/test-kmi-whitelist.cc: Likewise. * tests/test-lookup-syms.cc: Likewise. * tests/test-read-ctf.cc: Likewise. * tests/test-read-dwarf.cc: Likewise. * tests/test-read-write.cc: Likewise. * tests/test-svg.cc: Likewise. * tests/test-symtab-reader.cc: Likewise. * tests/test-symtab.cc: Likewise. * tests/test-tools-utils.cc: Likewise. * tests/test-types-stability.cc: Likewise. * tests/test-utils.cc: Likewise. * tests/test-utils.h: Likewise. * tools/abicompat.cc: Likewise. * tools/abidiff.cc: Likewise. * tools/abidw.cc: Likewise. * tools/abilint.cc: Likewise. * tools/abipkgdiff.cc: Likewise. * tools/abisym.cc: Likewise. * tools/binilint.cc: Likewise. * tools/kmidiff.cc: Likewise. Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2023-01-01 17:14:26 +00:00
// Copyright (C) 2020-2023 Google, Inc.
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
//
// Author: Matthias Maennich
/// @file
///
/// This program tests suppression generation from KMI whitelists.
#include <string>
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
#include "lib/catch.hpp"
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
#include "abg-fwd.h"
#include "abg-suppression.h"
#include "abg-tools-utils.h"
#include "test-utils.h"
using abigail::tools_utils::gen_suppr_spec_from_kernel_abi_whitelists;
using abigail::suppr::suppression_sptr;
using abigail::suppr::suppressions_type;
using abigail::suppr::function_suppression_sptr;
using abigail::suppr::variable_suppression_sptr;
using abigail::suppr::is_function_suppression;
using abigail::suppr::is_variable_suppression;
const static std::string whitelist_with_single_entry
= std::string(abigail::tests::get_src_dir())
+ "/tests/data/test-kmi-whitelist/whitelist-with-single-entry";
const static std::string whitelist_with_another_single_entry
= std::string(abigail::tests::get_src_dir())
+ "/tests/data/test-kmi-whitelist/whitelist-with-another-single-entry";
const static std::string whitelist_with_two_sections
= std::string(abigail::tests::get_src_dir())
+ "/tests/data/test-kmi-whitelist/whitelist-with-two-sections";
const static std::string whitelist_with_duplicate_entry
= std::string(abigail::tests::get_src_dir())
+ "/tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry";
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
void
test_suppressions_are_consistent(const suppressions_type& suppr,
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
const std::string& expr)
{
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
REQUIRE(suppr.size() == 2);
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
function_suppression_sptr left = is_function_suppression(suppr[0]);
variable_suppression_sptr right = is_variable_suppression(suppr[1]);
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
// correctly casted
REQUIRE(left);
REQUIRE(right);
// same label
REQUIRE(left->get_label() == right->get_label());
// same mode
REQUIRE(left->get_drops_artifact_from_ir()
== right->get_drops_artifact_from_ir());
// same regex
REQUIRE(left->get_symbol_name_not_regex_str()
== right->get_symbol_name_not_regex_str());
// regex as expected
REQUIRE(left->get_symbol_name_not_regex_str() == expr);
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
}
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
TEST_CASE("NoWhitelists", "[whitelists]")
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
{
const std::vector<std::string> abi_whitelist_paths;
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
suppressions_type suppr =
gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths);
REQUIRE(suppr.empty());
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
}
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
TEST_CASE("WhitelistWithASingleEntry", "[whitelists]")
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
{
std::vector<std::string> abi_whitelist_paths;
abi_whitelist_paths.push_back(whitelist_with_single_entry);
suppressions_type suppr
= gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths);
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
REQUIRE(!suppr.empty());
test_suppressions_are_consistent(suppr, "^(test_symbol)$");
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
}
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
TEST_CASE("WhitelistWithADuplicateEntry", "[whitelists]")
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
{
std::vector<std::string> abi_whitelist_paths;
abi_whitelist_paths.push_back(whitelist_with_duplicate_entry);
suppressions_type suppr
= gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths);
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
REQUIRE(!suppr.empty());
test_suppressions_are_consistent(suppr, "^(test_symbol)$");
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
}
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
TEST_CASE("TwoWhitelists", "[whitelists]")
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
{
std::vector<std::string> abi_whitelist_paths;
abi_whitelist_paths.push_back(whitelist_with_single_entry);
abi_whitelist_paths.push_back(whitelist_with_another_single_entry);
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
suppressions_type suppr =
gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths);
REQUIRE(!suppr.empty());
test_suppressions_are_consistent(suppr,
"^(test_another_symbol|test_symbol)$");
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
}
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
TEST_CASE("TwoWhitelistsWithDuplicates", "[whitelists]")
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
{
std::vector<std::string> abi_whitelist_paths;
abi_whitelist_paths.push_back(whitelist_with_duplicate_entry);
abi_whitelist_paths.push_back(whitelist_with_another_single_entry);
suppressions_type suppr
= gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths);
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
REQUIRE(!suppr.empty());
test_suppressions_are_consistent(suppr,
"^(test_another_symbol|test_symbol)$");
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
}
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
TEST_CASE("WhitelistWithTwoSections", "[whitelists]")
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
{
std::vector<std::string> abi_whitelist_paths;
abi_whitelist_paths.push_back(whitelist_with_two_sections);
suppressions_type suppr
= gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths);
Testing: add Catch Unit test framework This patch adds the Catch [1] unit test framework in version v1.12.2 [2] along with its integration into the existing build and test definition. While there is version v2 available, v1 still supports C++98, hence we can make use of it. The framework is distributed as a single header file. And since it is less then 500k and it comes with a permissive license, I decided to directly add the file rather than requiring users/developers/distributors to satisfy the new dependency. The integration is fairly simple: A new library libcatch.a provides the `main` for the tests that run with Catch. The tests themselves require to include the header as well and to link against said library. As an example I migrated the test-kmi-whitelist test to Catch. The test becomes a bit more structured and error reporting significantly improved. E.g. see this intentional breakage: | --- a/tests/test-kmi-whitelist.cc | +++ b/tests/test-kmi-whitelist.cc | @@ -140,5 +140,5 @@ TEST_CASE("WhitelistWithTwoSections", "[whitelists]") | suppressions_type suppr | = gen_suppr_spec_from_kernel_abi_whitelists(abi_whitelist_paths); | REQUIRE(!suppr.empty()); | - test_suppressions_are_consistent(suppr, "^test_symbol1$|^test_symbol2$"); | + test_suppressions_are_consistent(suppr, "^test_symbol$|^test_symbol2$"); It leads to this test output: | --------------------------------------------------------------------------- | WhitelistWithTwoSections | --------------------------------------------------------------------------- | ../../tests/test-kmi-whitelist.cc:136 | ........................................................................... | | ../../tests/test-kmi-whitelist.cc:81: FAILED: | REQUIRE( left->get_symbol_name_not_regex_str() == expr ) | with expansion: | "^test_symbol1$|^test_symbol2$" | == | "^test_symbol$|^test_symbol2$" | | =========================================================================== | test cases: 6 | 5 passed | 1 failed | assertions: 41 | 40 passed | 1 failed [1] https://github.com/catchorg/Catch2 [2] https://github.com/catchorg/Catch2/releases/tag/v1.12.2 * tests/.gitignore: Add entry for .dirstamp * tests/Makefile.am: Add libcatch test library and use it for runtestkmiwhitelist. * tests/lib/catch.cc: New test driver implementation. * tests/lib/catch.hpp: Add Catch v1.12.2 header only test library. * tests/test-kmi-whitelist.cc: Migrate to use Catch test framework. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-26 20:29:56 +00:00
REQUIRE(!suppr.empty());
test_suppressions_are_consistent(suppr, "^(test_symbol1|test_symbol2)$");
KMI Whitelists: Add functionality to make whitelists additive If multiple KMI whitelists are specified, either by passing --kmi-whitelist several times or by having multiple whitelist sections in the whitelist files, the generated suppressions are created as an intersection of symbols. That is rather unusual, as whitelisting should rather work additive. That means that the symbols (or expressions thereof) defined across several sections or files shall be considered a union of symbols. This patch combines the whitelist parsing to create exactly one function_suppression and one variable suppression. A test case has been added to ensure the functionality is working. Please note, migrating the existing code to this new functionality is done in a separate commit. * include/abg-tools-utils.h (gen_suppr_spec_from_kernel_abi_whitelists): New function. * src/abg-tools-utils.cc (gen_suppr_spec_from_kernel_abi_whitelists): Likewise. * tests/.gitignore: Ignore new test executable. * tests/Makefile.am: Add new test executable. * tests/data/test-kmi-whitelist/whitelist-with-another-single-entry: New test input file. * tests/data/test-kmi-whitelist/whitelist-with-duplicate-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-single-entry: Likewise. * tests/data/test-kmi-whitelist/whitelist-with-two-sections: Likewise. * tests/data/Makefile.am: Add above test material. * tests/test-kmi-whitelist.cc: Add new test executable. Reviewed-by: Dodji Seketeli <dodji@seketeli.org> Signed-off-by: Matthias Maennich <maennich@google.com>
2020-01-14 17:34:49 +00:00
}