2014-03-29 05:44:13 +00:00
|
|
|
// -*- Mode: C++ -*-
|
|
|
|
//
|
|
|
|
// Copyright (C) 2013 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 ELF files containing DWARF
|
|
|
|
/// debugging information 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 bidiff command line comparison tool.
|
|
|
|
///
|
|
|
|
/// 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"
|
|
|
|
|
|
|
|
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* bidiff_options;
|
|
|
|
const char* in_report_path;
|
|
|
|
const char* out_report_path;
|
|
|
|
}; // end struct InOutSpec;
|
|
|
|
|
|
|
|
InOutSpec in_out_specs[] =
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"data/test-diff-filter/test0-v0.o",
|
|
|
|
"data/test-diff-filter/test0-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test0-report.txt",
|
|
|
|
"output/test-diff-filter/test0-report.txt",
|
|
|
|
},
|
2014-04-01 13:50:04 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test0-v0.o",
|
|
|
|
"data/test-diff-filter/test0-v1.o",
|
|
|
|
"",
|
|
|
|
"data/test-diff-filter/test01-report.txt",
|
|
|
|
"output/test-diff-filter/test01-report.txt",
|
|
|
|
},
|
2014-03-31 11:07:04 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test1-v0.o",
|
|
|
|
"data/test-diff-filter/test1-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test1-report.txt",
|
|
|
|
"output/test-diff-filter/test1-report.txt",
|
|
|
|
},
|
2014-04-01 13:50:04 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test2-v0.o",
|
|
|
|
"data/test-diff-filter/test2-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test2-report.txt",
|
|
|
|
"output/test-diff-filter/test2-report.txt",
|
|
|
|
},
|
2014-04-02 15:23:56 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test3-v0.o",
|
|
|
|
"data/test-diff-filter/test3-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test3-report.txt",
|
|
|
|
"output/test-diff-filter/test3-report.txt",
|
|
|
|
},
|
Do not hook type diff nodes to a parent
A given diff node for a type can be hung off of several contexts: a
function parameter type node, another type diff node, etc. For that
reason, a type diff node should not have a parent node. Thus, it's
should be the job of the context containing the type diff node to
propagate its categories to the context nodes. This actually fixes a bug
about category propagation.
* abg/comparison.cc (var_diff::var_diff): Do not set parent node
for the type diff of the var_diff.
(var_diff::traverse): Handle category propagation from the
type diff node to the var_diff node.
(pointer_diff::underlying_type_diff)
(reference_diff::underlying_type_diff)
(qualified_type_diff::underlying_type_diff, enum_diff::enum_diff)
(base_diff::get_underlying_class_diff)
(typedef_diff::underlying_type_diff): Do not set the parent node
here.
({pointer_diff, reference_diff, qualified_type, enum_diff,
class_diff, base_diff, function_decl_diff,
typedef_diff}::traverse): Handle category propagation here.
* tests/data/test-diff-filter/test4-v0.o: New input binary.
* tests/data/test-diff-filter/test4-v0.cc: Source code for the
input binary above.
* tests/data/test-diff-filter/test4-v1.o: New input binary.
* tests/data/test-diff-filter/test4-v1.cc: Source code for the
input binary above.
* tests/data/test-diff-filter/test4-report.txt: Reference diff
report for the input binaries above.
* tests/test-diff-filter.cc:: Run bidiff --no-harmless on the
binaries above.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2014-04-04 12:44:50 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test4-v0.o",
|
|
|
|
"data/test-diff-filter/test4-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test4-report.txt",
|
|
|
|
"output/test-diff-filter/test4-report.txt",
|
|
|
|
},
|
2014-04-05 09:59:16 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test5-v0.o",
|
|
|
|
"data/test-diff-filter/test5-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test5-report.txt",
|
|
|
|
"output/test-diff-filter/test5-report.txt",
|
|
|
|
},
|
2014-04-06 13:59:38 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test6-v0.o",
|
|
|
|
"data/test-diff-filter/test6-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test6-report.txt",
|
|
|
|
"output/test-diff-filter/test6-report.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"data/test-diff-filter/test7-v0.o",
|
|
|
|
"data/test-diff-filter/test7-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test7-report.txt",
|
|
|
|
"output/test-diff-filter/test7-report.txt",
|
|
|
|
},
|
2014-04-11 14:52:00 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test8-v0.o",
|
|
|
|
"data/test-diff-filter/test8-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test8-report.txt",
|
|
|
|
"output/test-diff-filter/test8-report.txt",
|
|
|
|
},
|
2014-04-13 21:09:02 +00:00
|
|
|
{
|
|
|
|
"data/test-diff-filter/test9-v0.o",
|
|
|
|
"data/test-diff-filter/test9-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test9-report.txt",
|
|
|
|
"output/test-diff-filter/test9-report.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"data/test-diff-filter/test10-v0.o",
|
|
|
|
"data/test-diff-filter/test10-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test10-report.txt",
|
|
|
|
"output/test-diff-filter/test10-report.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"data/test-diff-filter/test11-v0.o",
|
|
|
|
"data/test-diff-filter/test11-v1.o",
|
|
|
|
"--no-harmless",
|
|
|
|
"data/test-diff-filter/test11-report.txt",
|
|
|
|
"output/test-diff-filter/test11-report.txt",
|
|
|
|
},
|
2014-03-29 05:44:13 +00:00
|
|
|
// This should be the last entry
|
|
|
|
{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,
|
|
|
|
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;
|
|
|
|
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/bidiff";
|
|
|
|
bidiff += " " + bidiff_options;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|