mirror of
git://sourceware.org/git/libabigail.git
synced 2024-12-30 05:42:05 +00:00
4ef7b34387
* abg-ir.{h,cc} (decl_base::decl_base, scope_decl::scope_decl)
(type_decl::type_decl, namespace_decl::namespace_decl): Do not
append a decl to its context from within its constructor. It's
better doing that in a function that takes shared_ptrs to decl and
context. That way we avoid memory management havoc.
(decl_base::set_scope): New private function.
(scope_decl::add_member_decl): Make this private.
(add_decl_to_scope): New function, friend of decl_base and
scope_decl.
* abg-reader.cc (read_context::get_cur_scope): Add a non-const
overload.
(handle_type_decl, handle_namespace_decl): Use add_decl_to_scope.
Adjust to new type_decl and namespace_decl constructor signature.
* src/abg-writer.cc (write_type): Emit 'id', not 'xml:id'.
(write_namespace_decl): Emit "namespace-decl", not
"namespace-decl-name", as the name of namespace element.
* tests/Makefile.am (test0.xml): Rename input0.xml into this.
(test1.xml): New test input.
* tests/data/test-read-write/test0.xml: Update to use 'id' as id
attribute, rather than xml:id.
* tests/data/test-read-write/test1.xml: New test.
* test-read-write.cc (struct InOutSpec): New
(main): Reorganize to give a list of input files to read and to
write to an output file, have the test read the input files, write
them, and diff the two.
87 lines
1.9 KiB
C++
87 lines
1.9 KiB
C++
// -*- Mode: C++ -*-
|
|
|
|
#include <string>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <cstdlib>
|
|
#include "test-utils.h"
|
|
#include "abg-reader.h"
|
|
#include "abg-writer.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_path;
|
|
const char* out_path;
|
|
};// end struct InOutSpec
|
|
|
|
|
|
InOutSpec in_out_specs[] =
|
|
{
|
|
{
|
|
"data/test-read-write/test0.xml",
|
|
"output/test-read-write/test0.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test1.xml",
|
|
"output/test-read-write/test1.xml"
|
|
},
|
|
|
|
// This should be the last entry.
|
|
{NULL, NULL}
|
|
};
|
|
|
|
/// Walk the array of InOutSpecs above, read the input files it points
|
|
/// to, write it into the output it points to and diff them.
|
|
int
|
|
main()
|
|
{
|
|
unsigned result = 1;
|
|
|
|
bool is_ok = true;
|
|
string in_path, out_path;
|
|
for (InOutSpec *s = in_out_specs; s->in_path; ++s)
|
|
{
|
|
string input_suffix(s->in_path);
|
|
in_path = abigail::tests::get_src_dir() + "/tests/" + input_suffix;
|
|
abigail::abi_corpus corpus(input_suffix);
|
|
if (!abigail::reader::read_file(in_path, corpus))
|
|
{
|
|
cerr << "failed to read " << in_path;
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
|
|
string output_suffix(s->out_path);
|
|
out_path = abigail::tests::get_build_dir() + "/tests/" + output_suffix;
|
|
if (!abigail::tests::ensure_parent_dir_created(out_path))
|
|
{
|
|
cerr << "Could not create parent director for " << out_path;
|
|
is_ok = false;
|
|
return result;
|
|
}
|
|
|
|
ofstream of(out_path.c_str(), std::ios_base::trunc);
|
|
if (!of.is_open())
|
|
{
|
|
cerr << "failed to read " << out_path;
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
|
|
is_ok = (is_ok && abigail::writer::write_to_ostream(corpus, of));
|
|
of.close();
|
|
string cmd = "diff -u " + in_path + " " + out_path;
|
|
if (system(cmd.c_str()))
|
|
is_ok = false;
|
|
}
|
|
|
|
return !is_ok;
|
|
}
|