mirror of
git://sourceware.org/git/libabigail.git
synced 2025-03-10 00:27:48 +00:00
* include/abg-comparison.h (variable_suppression_sptr) (variable_suppressions_type): New convenience typedefs. (class variable_suppression): Declare new type. * src/abg-comparison.cc (is_var_diff): New predicate. (read_variable_suppression): Define new static function. (class variable_suppression::priv): Define type for the private data of the variable_suppression type. (variable_suppression::{variable_suppression, ~variable_suppression, get_name, set_name, get_name_regex_str, set_name_regex_str, get_symbol_name, set_symbol_name, get_symbol_name_regex_str, set_symbol_name_regex_str, get_symbol_version, set_symbol_version, get_symbol_version_regex_str, set_symbol_version_regex_str, get_type_name, set_type_name, get_type_name_regex_str, set_type_name_regex_str, suppresses_diff}): Define new member functions for the variable_suppression type. * tests/data/test-diff-suppr/libtest7-var-suppr-v0.so: Add new test input. * tests/data/test-diff-suppr/libtest7-var-suppr-v1.so: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-1.suppr: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-2.suppr: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-3.suppr: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-4.suppr: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-5.suppr: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-6.suppr: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-7.suppr: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-8.suppr: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-0.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-1.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-2.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-3.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-4.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-5.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-6.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-7.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-report-8.txt: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-version-script: Likewise. * tests/data/test-diff-suppr/test7-var-suppr-v0.cc: Source code for the librairie above. * tests/data/test-diff-suppr/test7-var-suppr-v1.cc: Source code for the librairie above. * tests/Makefile.am: Add the new test input data to the source distribution. * tests/test-diff-suppr.cc: Update to make this harness to run over the new test input above. Signed-off-by: Dodji Seketeli <dodji@redhat.com>
385 lines
12 KiB
C++
385 lines
12 KiB
C++
// -*- Mode: C++ -*-
|
|
//
|
|
// Copyright (C) 2013-2014 Red Hat, Inc.
|
|
//
|
|
// This file is part of the GNU Application Binary Interface Generic
|
|
// Analysis and Instrumentation Library (libabigail). This library is
|
|
// free software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU Lesser General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option) any
|
|
// later version.
|
|
|
|
// This library is distributed in the hope that it will be useful, but
|
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// General Lesser Public License for more details.
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this program; see the file COPYING-LGPLV3. If
|
|
// not, see <http://www.gnu.org/licenses/>.
|
|
|
|
// Author: Dodji Seketeli
|
|
|
|
/// @file
|
|
///
|
|
/// This test harness program runs a diff between input ELF files
|
|
/// containing DWARF debugging information, exercising the
|
|
/// suppressions features of the "bidiff" command line program.
|
|
///
|
|
/// So it runs the diff diff between the two input files, using a
|
|
/// suppression file and compares the resulting diff with a reference
|
|
/// one.
|
|
|
|
#include <cstring>
|
|
#include <string>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <cstdlib>
|
|
#include "abg-tools-utils.h"
|
|
#include "test-utils.h"
|
|
|
|
using std::string;
|
|
using std::cerr;
|
|
|
|
/// This is an aggregate that specifies where a test shall get its
|
|
/// input from and where it shall write its ouput to.
|
|
struct InOutSpec
|
|
{
|
|
const char* in_elfv0_path;
|
|
const char* in_elfv1_path;
|
|
const char* in_suppr_path;
|
|
const char* bidiff_options;
|
|
const char* in_report_path;
|
|
const char* out_report_path;
|
|
}; // end struct InOutSpec;
|
|
|
|
InOutSpec in_out_specs[] =
|
|
{
|
|
{
|
|
"data/test-diff-suppr/test0-type-suppr-v0.o",
|
|
"data/test-diff-suppr/test0-type-suppr-v1.o",
|
|
NULL,
|
|
"",
|
|
"data/test-diff-suppr/test0-type-suppr-report-0.txt",
|
|
"output/test-diff-suppr/test0-type-suppr-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test0-type-suppr-v0.o",
|
|
"data/test-diff-suppr/test0-type-suppr-v1.o",
|
|
"data/test-diff-suppr/test0-type-suppr-0.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test0-type-suppr-report-1.txt",
|
|
"output/test-diff-suppr/test0-type-suppr-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test0-type-suppr-v0.o",
|
|
"data/test-diff-suppr/test0-type-suppr-v1.o",
|
|
"data/test-diff-suppr/test0-type-suppr-1.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test0-type-suppr-report-2.txt",
|
|
"output/test-diff-suppr/test0-type-suppr-report-2.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test0-type-suppr-v0.o",
|
|
"data/test-diff-suppr/test0-type-suppr-v1.o",
|
|
"data/test-diff-suppr/test0-type-suppr-2.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test0-type-suppr-report-3.txt",
|
|
"output/test-diff-suppr/test0-type-suppr-report-3.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test1-typedef-suppr-v0.o",
|
|
"data/test-diff-suppr/test1-typedef-suppr-v1.o",
|
|
"",
|
|
"",
|
|
"data/test-diff-suppr/test1-typedef-suppr-report-0.txt",
|
|
"output/test-diff-suppr/test1-typedef-suppr-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test1-typedef-suppr-v0.o",
|
|
"data/test-diff-suppr/test1-typedef-suppr-v1.o",
|
|
"data/test-diff-suppr/test1-typedef-suppr-0.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test1-typedef-suppr-report-1.txt",
|
|
"output/test-diff-suppr/test1-typedef-suppr-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test1-typedef-suppr-v0.o",
|
|
"data/test-diff-suppr/test1-typedef-suppr-v1.o",
|
|
"data/test-diff-suppr/test1-typedef-suppr-1.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test1-typedef-suppr-report-2.txt",
|
|
"output/test-diff-suppr/test1-typedef-suppr-report-2.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test2-struct-suppr-v0.o",
|
|
"data/test-diff-suppr/test2-struct-suppr-v1.o",
|
|
"data/test-diff-suppr/test2-struct-suppr-0.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test2-struct-suppr-report-0.txt",
|
|
"output/test-diff-suppr/test2-struct-suppr-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test2-struct-suppr-v0.o",
|
|
"data/test-diff-suppr/test2-struct-suppr-v1.o",
|
|
"data/test-diff-suppr/test2-struct-suppr-1.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test2-struct-suppr-report-1.txt",
|
|
"output/test-diff-suppr/test2-struct-suppr-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test3-struct-suppr-v0.o",
|
|
"data/test-diff-suppr/test3-struct-suppr-v1.o",
|
|
NULL,
|
|
"",
|
|
"data/test-diff-suppr/test3-struct-suppr-report-0.txt",
|
|
"output/test-diff-suppr/test3-struct-suppr-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test3-struct-suppr-v0.o",
|
|
"data/test-diff-suppr/test3-struct-suppr-v1.o",
|
|
"data/test-diff-suppr/test3-struct-suppr-0.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test3-struct-suppr-report-1.txt",
|
|
"output/test-diff-suppr/test3-struct-suppr-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/test3-struct-suppr-v0.o",
|
|
"data/test-diff-suppr/test3-struct-suppr-v1.o",
|
|
"data/test-diff-suppr/test3-struct-suppr-1.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test3-struct-suppr-report-2.txt",
|
|
"output/test-diff-suppr/test3-struct-suppr-report-2.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest4-local-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest4-local-suppr-v1.so",
|
|
"data/test-diff-suppr/test4-local-suppr-0.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test4-local-suppr-report-1.txt",
|
|
"output/test-diff-suppr/test4-local-suppr-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest4-local-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest4-local-suppr-v1.so",
|
|
"",
|
|
"",
|
|
"data/test-diff-suppr/test4-local-suppr-report-0.txt",
|
|
"output/test-diff-suppr/test4-local-suppr-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v1.so",
|
|
"",
|
|
"",
|
|
"data/test-diff-suppr/test5-fn-suppr-report-0.txt",
|
|
"output/test-diff-suppr/test5-fn-suppr-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v1.so",
|
|
"data/test-diff-suppr/test5-fn-suppr-0.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test5-fn-suppr-report-1.txt",
|
|
"output/test-diff-suppr/test5-fn-suppr-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v1.so",
|
|
"data/test-diff-suppr/test5-fn-suppr-1.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test5-fn-suppr-report-2.txt",
|
|
"output/test-diff-suppr/test5-fn-suppr-report-2.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v1.so",
|
|
"data/test-diff-suppr/test5-fn-suppr-2.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test5-fn-suppr-report-3.txt",
|
|
"output/test-diff-suppr/test5-fn-suppr-report-3.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v1.so",
|
|
"data/test-diff-suppr/test5-fn-suppr-3.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test5-fn-suppr-report-4.txt",
|
|
"output/test-diff-suppr/test5-fn-suppr-report-4.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest5-fn-suppr-v1.so",
|
|
"data/test-diff-suppr/test5-fn-suppr-4.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test5-fn-suppr-report-5.txt",
|
|
"output/test-diff-suppr/test5-fn-suppr-report-5.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest6-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest6-fn-suppr-v1.so",
|
|
"",
|
|
"",
|
|
"data/test-diff-suppr/test6-fn-suppr-report-0.txt",
|
|
"output/test-diff-suppr/test6-fn-suppr-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest6-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest6-fn-suppr-v1.so",
|
|
"data/test-diff-suppr/test6-fn-suppr-0.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test6-fn-suppr-report-1.txt",
|
|
"output/test-diff-suppr/test6-fn-suppr-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest6-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest6-fn-suppr-v1.so",
|
|
"data/test-diff-suppr/test6-fn-suppr-1.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test6-fn-suppr-report-2.txt",
|
|
"output/test-diff-suppr/test6-fn-suppr-report-2.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest6-fn-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest6-fn-suppr-v1.so",
|
|
"data/test-diff-suppr/test6-fn-suppr-2.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test6-fn-suppr-report-3.txt",
|
|
"output/test-diff-suppr/test6-fn-suppr-report-3.txt",
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-0.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"data/test-diff-suppr/test7-var-suppr-1.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-1.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-1.txt"
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"data/test-diff-suppr/test7-var-suppr-2.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-2.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-2.txt"
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"data/test-diff-suppr/test7-var-suppr-3.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-3.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-3.txt"
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"data/test-diff-suppr/test7-var-suppr-4.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-4.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-4.txt"
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"data/test-diff-suppr/test7-var-suppr-5.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-5.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-5.txt"
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"data/test-diff-suppr/test7-var-suppr-6.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-6.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-6.txt"
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"data/test-diff-suppr/test7-var-suppr-7.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-7.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-7.txt"
|
|
},
|
|
{
|
|
"data/test-diff-suppr/libtest7-var-suppr-v0.so",
|
|
"data/test-diff-suppr/libtest7-var-suppr-v1.so",
|
|
"data/test-diff-suppr/test7-var-suppr-8.suppr",
|
|
"",
|
|
"data/test-diff-suppr/test7-var-suppr-report-8.txt",
|
|
"output/test-diff-suppr/test7-var-suppr-report-8.txt"
|
|
},
|
|
// This should be the last entry
|
|
{NULL, NULL, NULL, NULL, NULL, NULL}
|
|
};
|
|
|
|
int
|
|
main()
|
|
{
|
|
using abigail::tests::get_src_dir;
|
|
using abigail::tests::get_build_dir;
|
|
using abigail::tools::ensure_parent_dir_created;
|
|
|
|
bool is_ok = true;
|
|
string in_elfv0_path, in_elfv1_path,
|
|
in_suppression_path, bidiff_options, bidiff, cmd,
|
|
ref_diff_report_path, out_diff_report_path;
|
|
|
|
for (InOutSpec* s = in_out_specs; s->in_elfv0_path; ++s)
|
|
{
|
|
in_elfv0_path = get_src_dir() + "/tests/" + s->in_elfv0_path;
|
|
in_elfv1_path = get_src_dir() + "/tests/" + s->in_elfv1_path;
|
|
if (s->in_suppr_path && strcmp(s->in_suppr_path, ""))
|
|
in_suppression_path = get_src_dir() + "/tests/" + s->in_suppr_path;
|
|
else
|
|
in_suppression_path.clear();
|
|
|
|
bidiff_options = s->bidiff_options;
|
|
ref_diff_report_path = get_src_dir() + "/tests/" + s->in_report_path;
|
|
out_diff_report_path = get_build_dir() + "/tests/" + s->out_report_path;
|
|
|
|
if (!ensure_parent_dir_created(out_diff_report_path))
|
|
{
|
|
cerr << "could not create parent directory for "
|
|
<< out_diff_report_path;
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
|
|
bidiff = get_build_dir() + "/tools/abidiff";
|
|
bidiff += " " + bidiff_options;
|
|
|
|
if (!in_suppression_path.empty())
|
|
bidiff += " --suppressions " + in_suppression_path;
|
|
|
|
cmd = bidiff + " " + in_elfv0_path + " " + in_elfv1_path;
|
|
cmd += " > " + out_diff_report_path;
|
|
|
|
bool bidiff_ok = true;
|
|
if (system(cmd.c_str()))
|
|
bidiff_ok = false;
|
|
|
|
if (bidiff_ok)
|
|
{
|
|
cmd = "diff -u " + ref_diff_report_path
|
|
+ " " + out_diff_report_path;
|
|
if (system(cmd.c_str()))
|
|
is_ok = false;
|
|
}
|
|
else
|
|
is_ok = false;
|
|
}
|
|
|
|
return !is_ok;
|
|
}
|