mirror of
git://sourceware.org/git/libabigail.git
synced 2024-12-21 01:09:59 +00:00
6baecca506
In the changed functions/variables section of the abidiff report, when
function parameters were added or removed, they were not properly
sorted. This patch fixes that.
* src/abg-comparison.cc (sort_string_parm_map): Define new static
function.
(struct parm_comp): Define new type.
(function_type_diff::priv::{sorted_deleted_parms_,
sorted_added_parms_}): New data members that hold sorted
deleted/added parameters.
(function_type_diff::ensure_lookup_tables_populated): Initialize
the two new data members above.
(function_type_diff::report): For the report of parameters that
got added/removed, use the sorted set of added/removed parameters
above.
* tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt:
New test input.
* tests/data/test-diff-dwarf/libtest24-added-fn-parms-v{0,1}.so:
Likewise.
* tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt:
Likewise.
* tests/data/test-diff-dwarf/libtest25-removed-fn-parms-v{0,1}.so:
Likewise.
* tests/data/test-diff-dwarf/test24-added-fn-parms-v{0,1}.c:
Likewise.
* tests/data/test-diff-dwarf/test25-removed-fn-parms-v{0,1}.c:
Likewise.
* tests/data/Makefile.am: Add the new test material above to the
source distribution.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
310 lines
9.4 KiB
C++
310 lines
9.4 KiB
C++
// -*- Mode: C++ -*-
|
|
//
|
|
// Copyright (C) 2013-2015 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 program runs a diff between input dwarf files and compares
|
|
/// the resulting report with a reference report. If the resulting
|
|
/// report is different from the reference report, the test has
|
|
/// failed. Note that the comparison is done using the libabigail
|
|
/// library directly.
|
|
///
|
|
/// The set of input files and reference reports to consider should be
|
|
/// present in the source distribution.
|
|
|
|
#include <string>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <cstdlib>
|
|
#include "abg-tools-utils.h"
|
|
#include "test-utils.h"
|
|
#include "abg-dwarf-reader.h"
|
|
#include "abg-comparison.h"
|
|
|
|
using std::string;
|
|
using std::ofstream;
|
|
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_report_path;
|
|
const char* out_report_path;
|
|
};// end struct InOutSpec
|
|
|
|
InOutSpec in_out_specs[] =
|
|
{
|
|
{
|
|
"data/test-diff-dwarf/test0-v0.o",
|
|
"data/test-diff-dwarf/test0-v1.o",
|
|
"data/test-diff-dwarf/test0-report.txt",
|
|
"output/test-diff-dwarf/test0-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test1-v0.o",
|
|
"data/test-diff-dwarf/test1-v1.o",
|
|
"data/test-diff-dwarf/test1-report.txt",
|
|
"output/test-diff-dwarf/test1-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test2-v0.o",
|
|
"data/test-diff-dwarf/test2-v1.o",
|
|
"data/test-diff-dwarf/test2-report.txt",
|
|
"output/test-diff-dwarf/test2-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test3-v0.o",
|
|
"data/test-diff-dwarf/test3-v1.o",
|
|
"data/test-diff-dwarf/test3-report.txt",
|
|
"output/test-diff-dwarf/test3-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test3-v0.o",
|
|
"data/test-diff-dwarf/test3-v1.o",
|
|
"data/test-diff-dwarf/test3-report.txt",
|
|
"output/test-diff-dwarf/test3-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test4-v0.o",
|
|
"data/test-diff-dwarf/test4-v1.o",
|
|
"data/test-diff-dwarf/test4-report.txt",
|
|
"output/test-diff-dwarf/test4-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test5-v0.o",
|
|
"data/test-diff-dwarf/test5-v1.o",
|
|
"data/test-diff-dwarf/test5-report.txt",
|
|
"output/test-diff-dwarf/test5-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test6-v0.o",
|
|
"data/test-diff-dwarf/test6-v1.o",
|
|
"data/test-diff-dwarf/test6-report.txt",
|
|
"output/test-diff-dwarf/test6-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test7-v0.o",
|
|
"data/test-diff-dwarf/test7-v1.o",
|
|
"data/test-diff-dwarf/test7-report.txt",
|
|
"output/test-diff-dwarf/test7-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test8-v0.o",
|
|
"data/test-diff-dwarf/test8-v1.o",
|
|
"data/test-diff-dwarf/test8-report.txt",
|
|
"output/test-diff-dwarf/test8-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest9-v0.so",
|
|
"data/test-diff-dwarf/libtest9-v1.so",
|
|
"data/test-diff-dwarf/test9-report.txt",
|
|
"output/test-diff-dwarf/test9-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test10-v0.o",
|
|
"data/test-diff-dwarf/test10-v1.o",
|
|
"data/test-diff-dwarf/test10-report.txt",
|
|
"output/test-diff-dwarf/test10-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test11-v0.o",
|
|
"data/test-diff-dwarf/test11-v1.o",
|
|
"data/test-diff-dwarf/test11-report.txt",
|
|
"output/test-diff-dwarf/test11-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest12-v0.so",
|
|
"data/test-diff-dwarf/libtest12-v1.so",
|
|
"data/test-diff-dwarf/test12-report.txt",
|
|
"output/test-diff-dwarf/test12-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test13-v0.o",
|
|
"data/test-diff-dwarf/test13-v1.o",
|
|
"data/test-diff-dwarf/test13-report.txt",
|
|
"output/test-diff-dwarf/test13-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test14-inline-v0.o",
|
|
"data/test-diff-dwarf/test14-inline-v1.o",
|
|
"data/test-diff-dwarf/test14-inline-report.txt",
|
|
"output/test-diff-dwarf/test14-inline-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test15-enum-v0.o",
|
|
"data/test-diff-dwarf/test15-enum-v1.o",
|
|
"data/test-diff-dwarf/test15-enum-report.txt",
|
|
"output/test-diff-dwarf/test15-enum-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test16-syms-only-v0.o",
|
|
"data/test-diff-dwarf/test16-syms-only-v1.o",
|
|
"data/test-diff-dwarf/test16-syms-only-report.txt",
|
|
"output/test-diff-dwarf/test16-syms-only-report.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/test17-non-refed-syms-v0.o",
|
|
"data/test-diff-dwarf/test17-non-refed-syms-v1.o",
|
|
"data/test-diff-dwarf/test17-non-refed-syms-report-0.txt",
|
|
"output/test-diff-dwarf/test17-non-refed-syms-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest18-alias-sym-v0.so",
|
|
"data/test-diff-dwarf/libtest18-alias-sym-v1.so",
|
|
"data/test-diff-dwarf/test18-alias-sym-report-0.txt",
|
|
"output/test-diff-dwarf/test18-alias-sym-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest19-soname-v0.so",
|
|
"data/test-diff-dwarf/libtest19-soname-v1.so",
|
|
"data/test-diff-dwarf/test19-soname-report-0.txt",
|
|
"output/test-diff-dwarf/test19-soname-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest20-add-fn-parm-v0.so",
|
|
"data/test-diff-dwarf/libtest20-add-fn-parm-v1.so",
|
|
"data/test-diff-dwarf/test20-add-fn-parm-report-0.txt",
|
|
"output/test-diff-dwarf/test20-add-fn-parm-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest21-redundant-fn-v0.so",
|
|
"data/test-diff-dwarf/libtest21-redundant-fn-v1.so",
|
|
"data/test-diff-dwarf/test21-redundant-fn-report-0.txt",
|
|
"output/test-diff-dwarf/test21-redundant-fn-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest22-changed-parm-c-v0.so",
|
|
"data/test-diff-dwarf/libtest22-changed-parm-c-v1.so",
|
|
"data/test-diff-dwarf/test22-changed-parm-c-report-0.txt",
|
|
"output/test-diff-dwarf/test22-changed-parm-c-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest-23-diff-arch-v0-32.so",
|
|
"data/test-diff-dwarf/libtest-23-diff-arch-v0-64.so",
|
|
"data/test-diff-dwarf/test-23-diff-arch-report-0.txt",
|
|
"output/test-diff-dwarf/test-23-diff-arch-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest24-added-fn-parms-v0.so",
|
|
"data/test-diff-dwarf/libtest24-added-fn-parms-v1.so",
|
|
"data/test-diff-dwarf/test24-added-fn-parms-report-0.txt",
|
|
"output/test-diff-dwarf/test24-added-fn-parms-report-0.txt"
|
|
},
|
|
{
|
|
"data/test-diff-dwarf/libtest25-removed-fn-parms-v0.so",
|
|
"data/test-diff-dwarf/libtest25-removed-fn-parms-v1.so",
|
|
"data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt",
|
|
"output/test-diff-dwarf/test25-removed-fn-parms-report-0.txt"
|
|
},
|
|
// This should be the last entry
|
|
{NULL, NULL, NULL, NULL}
|
|
};
|
|
|
|
int
|
|
main()
|
|
{
|
|
using abigail::tests::get_src_dir;
|
|
using abigail::tests::get_build_dir;
|
|
using abigail::tools_utils::ensure_parent_dir_created;
|
|
using abigail::dwarf_reader::read_corpus_from_elf;
|
|
using abigail::comparison::compute_diff;
|
|
using abigail::comparison::corpus_diff_sptr;
|
|
|
|
bool is_ok = true;
|
|
string in_elfv0_path, in_elfv1_path,
|
|
ref_diff_report_path, out_diff_report_path;
|
|
abigail::corpus_sptr corp0, corp1;
|
|
|
|
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;
|
|
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;
|
|
}
|
|
|
|
read_corpus_from_elf(in_elfv0_path,
|
|
/*debug_info_root_path=*/0,
|
|
/*load_all_types=*/false,
|
|
corp0);
|
|
read_corpus_from_elf(in_elfv1_path,
|
|
/*debug_info_root_path=*/0,
|
|
/*load_all_types=*/false,
|
|
corp1);
|
|
|
|
if (!corp0)
|
|
{
|
|
cerr << "failed to read " << in_elfv0_path << "\n";
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
if (!corp1)
|
|
{
|
|
cerr << "failed to read " << in_elfv1_path << "\n";
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
|
|
corp0->set_path(s->in_elfv0_path);
|
|
corp1->set_path(s->in_elfv1_path);
|
|
|
|
corpus_diff_sptr d = compute_diff(corp0, corp1);
|
|
if (!d)
|
|
{
|
|
cerr << "failed to compute diff\n";
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
|
|
ref_diff_report_path = get_src_dir() + "/tests/" + s->in_report_path;
|
|
out_diff_report_path = get_build_dir() + "/tests/" + s->out_report_path;
|
|
|
|
ofstream of(out_diff_report_path.c_str(), std::ios_base::trunc);
|
|
if (!of.is_open())
|
|
{
|
|
cerr << "failed to read " << out_diff_report_path << "\n";
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
|
|
if (d->has_changes())
|
|
d->report(of);
|
|
of.close();
|
|
|
|
string cmd =
|
|
"diff -u " + ref_diff_report_path + " " + out_diff_report_path;
|
|
if (system(cmd.c_str()))
|
|
is_ok = false;
|
|
}
|
|
|
|
return !is_ok;
|
|
}
|