diff --git a/tests/Makefile.am b/tests/Makefile.am index f8c0cf7e..1115d393 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,7 +13,7 @@ runtestreaddwarf \ runtestlookupsyms \ runtestaltdwarf \ runtestcorediff \ -runtestbidiff \ +runtestabidiff \ runtestdiffdwarf \ runtestdifffilter \ runtestsvg @@ -52,8 +52,8 @@ runtestaltdwarf_LDADD=libtestutils.la $(top_builddir)/src/libabigail.la runtestcorediff_SOURCES=test-core-diff.cc runtestcorediff_LDADD=libtestutils.la $(top_builddir)/src/libabigail.la -runtestbidiff_SOURCES = test-bidiff.cc -runtestbidiff_LDADD = libtestutils.la $(top_builddir)/src/libabigail.la +runtestabidiff_SOURCES = test-abidiff.cc +runtestabidiff_LDADD = libtestutils.la $(top_builddir)/src/libabigail.la runtestdiffdwarf_SOURCES = test-diff-dwarf.cc runtestdiffdwarf_LDADD = libtestutils.la $(top_builddir)/src/libabigail.la @@ -111,24 +111,24 @@ data/test-write-read-archive/test2.xml \ data/test-write-read-archive/test3.xml \ data/test-write-read-archive/test4.xml \ \ -data/test-bidiff/test-enum0-v0.cc.bi \ -data/test-bidiff/test-enum0-v1.cc.bi \ -data/test-bidiff/test-enum0-report.txt \ -data/test-bidiff/test-enum1-v0.cc.bi \ -data/test-bidiff/test-enum1-v1.cc.bi \ -data/test-bidiff/test-enum1-report.txt \ -data/test-bidiff/test-qual-type0-v0.cc.bi \ -data/test-bidiff/test-qual-type0-v1.cc.bi \ -data/test-bidiff/test-qual-type0-report.txt \ -data/test-bidiff/test-struct0-v0.cc.bi \ -data/test-bidiff/test-struct0-v1.cc.bi \ -data/test-bidiff/test-struct0-report.txt \ -data/test-bidiff/test-struct1-v0.cc.bi \ -data/test-bidiff/test-struct1-v1.cc.bi \ -data/test-bidiff/test-struct1-report.txt \ -data/test-bidiff/test-var0-v0.cc.bi \ -data/test-bidiff/test-var0-v1.cc.bi \ -data/test-bidiff/test-var0-report.txt \ +data/test-abidiff/test-enum0-v0.cc.bi \ +data/test-abidiff/test-enum0-v1.cc.bi \ +data/test-abidiff/test-enum0-report.txt \ +data/test-abidiff/test-enum1-v0.cc.bi \ +data/test-abidiff/test-enum1-v1.cc.bi \ +data/test-abidiff/test-enum1-report.txt \ +data/test-abidiff/test-qual-type0-v0.cc.bi \ +data/test-abidiff/test-qual-type0-v1.cc.bi \ +data/test-abidiff/test-qual-type0-report.txt \ +data/test-abidiff/test-struct0-v0.cc.bi \ +data/test-abidiff/test-struct0-v1.cc.bi \ +data/test-abidiff/test-struct0-report.txt \ +data/test-abidiff/test-struct1-v0.cc.bi \ +data/test-abidiff/test-struct1-v1.cc.bi \ +data/test-abidiff/test-struct1-report.txt \ +data/test-abidiff/test-var0-v0.cc.bi \ +data/test-abidiff/test-var0-v1.cc.bi \ +data/test-abidiff/test-var0-report.txt \ \ data/test-diff-dwarf/test0-v0.cc \ data/test-diff-dwarf/test0-v0.o \ diff --git a/tests/data/test-bidiff/test-enum0-report.txt b/tests/data/test-abidiff/test-enum0-report.txt similarity index 100% rename from tests/data/test-bidiff/test-enum0-report.txt rename to tests/data/test-abidiff/test-enum0-report.txt diff --git a/tests/data/test-bidiff/test-enum0-v0.cc.bi b/tests/data/test-abidiff/test-enum0-v0.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-enum0-v0.cc.bi rename to tests/data/test-abidiff/test-enum0-v0.cc.bi diff --git a/tests/data/test-bidiff/test-enum0-v1.cc.bi b/tests/data/test-abidiff/test-enum0-v1.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-enum0-v1.cc.bi rename to tests/data/test-abidiff/test-enum0-v1.cc.bi diff --git a/tests/data/test-bidiff/test-enum1-report.txt b/tests/data/test-abidiff/test-enum1-report.txt similarity index 100% rename from tests/data/test-bidiff/test-enum1-report.txt rename to tests/data/test-abidiff/test-enum1-report.txt diff --git a/tests/data/test-bidiff/test-enum1-v0.cc.bi b/tests/data/test-abidiff/test-enum1-v0.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-enum1-v0.cc.bi rename to tests/data/test-abidiff/test-enum1-v0.cc.bi diff --git a/tests/data/test-bidiff/test-enum1-v1.cc.bi b/tests/data/test-abidiff/test-enum1-v1.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-enum1-v1.cc.bi rename to tests/data/test-abidiff/test-enum1-v1.cc.bi diff --git a/tests/data/test-bidiff/test-qual-type0-report.txt b/tests/data/test-abidiff/test-qual-type0-report.txt similarity index 100% rename from tests/data/test-bidiff/test-qual-type0-report.txt rename to tests/data/test-abidiff/test-qual-type0-report.txt diff --git a/tests/data/test-bidiff/test-qual-type0-v0.cc.bi b/tests/data/test-abidiff/test-qual-type0-v0.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-qual-type0-v0.cc.bi rename to tests/data/test-abidiff/test-qual-type0-v0.cc.bi diff --git a/tests/data/test-bidiff/test-qual-type0-v1.cc.bi b/tests/data/test-abidiff/test-qual-type0-v1.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-qual-type0-v1.cc.bi rename to tests/data/test-abidiff/test-qual-type0-v1.cc.bi diff --git a/tests/data/test-bidiff/test-struct0-report.txt b/tests/data/test-abidiff/test-struct0-report.txt similarity index 100% rename from tests/data/test-bidiff/test-struct0-report.txt rename to tests/data/test-abidiff/test-struct0-report.txt diff --git a/tests/data/test-bidiff/test-struct0-v0.cc.bi b/tests/data/test-abidiff/test-struct0-v0.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-struct0-v0.cc.bi rename to tests/data/test-abidiff/test-struct0-v0.cc.bi diff --git a/tests/data/test-bidiff/test-struct0-v1.cc.bi b/tests/data/test-abidiff/test-struct0-v1.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-struct0-v1.cc.bi rename to tests/data/test-abidiff/test-struct0-v1.cc.bi diff --git a/tests/data/test-bidiff/test-struct1-report.txt b/tests/data/test-abidiff/test-struct1-report.txt similarity index 100% rename from tests/data/test-bidiff/test-struct1-report.txt rename to tests/data/test-abidiff/test-struct1-report.txt diff --git a/tests/data/test-bidiff/test-struct1-v0.cc.bi b/tests/data/test-abidiff/test-struct1-v0.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-struct1-v0.cc.bi rename to tests/data/test-abidiff/test-struct1-v0.cc.bi diff --git a/tests/data/test-bidiff/test-struct1-v1.cc.bi b/tests/data/test-abidiff/test-struct1-v1.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-struct1-v1.cc.bi rename to tests/data/test-abidiff/test-struct1-v1.cc.bi diff --git a/tests/data/test-bidiff/test-var0-report.txt b/tests/data/test-abidiff/test-var0-report.txt similarity index 100% rename from tests/data/test-bidiff/test-var0-report.txt rename to tests/data/test-abidiff/test-var0-report.txt diff --git a/tests/data/test-bidiff/test-var0-v0.cc.bi b/tests/data/test-abidiff/test-var0-v0.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-var0-v0.cc.bi rename to tests/data/test-abidiff/test-var0-v0.cc.bi diff --git a/tests/data/test-bidiff/test-var0-v1.cc.bi b/tests/data/test-abidiff/test-var0-v1.cc.bi similarity index 100% rename from tests/data/test-bidiff/test-var0-v1.cc.bi rename to tests/data/test-abidiff/test-var0-v1.cc.bi diff --git a/tests/test-bidiff.cc b/tests/test-abidiff.cc similarity index 76% rename from tests/test-bidiff.cc rename to tests/test-abidiff.cc index f90674d4..3a9791be 100644 --- a/tests/test-bidiff.cc +++ b/tests/test-abidiff.cc @@ -53,40 +53,40 @@ struct InOutSpec static InOutSpec specs[] = { { - "data/test-bidiff/test-enum0-v0.cc.bi", - "data/test-bidiff/test-enum0-v1.cc.bi", - "data/test-bidiff/test-enum0-report.txt", - "output/test-bidiff/test-enum0-report.txt" + "data/test-abidiff/test-enum0-v0.cc.bi", + "data/test-abidiff/test-enum0-v1.cc.bi", + "data/test-abidiff/test-enum0-report.txt", + "output/test-abidiff/test-enum0-report.txt" }, { - "data/test-bidiff/test-enum1-v0.cc.bi", - "data/test-bidiff/test-enum1-v1.cc.bi", - "data/test-bidiff/test-enum1-report.txt", - "output/test-bidiff/test-enum1-report.txt" + "data/test-abidiff/test-enum1-v0.cc.bi", + "data/test-abidiff/test-enum1-v1.cc.bi", + "data/test-abidiff/test-enum1-report.txt", + "output/test-abidiff/test-enum1-report.txt" }, { - "data/test-bidiff/test-qual-type0-v0.cc.bi", - "data/test-bidiff/test-qual-type0-v1.cc.bi", - "data/test-bidiff/test-qual-type0-report.txt", - "output/test-bidiff/test-qual-type0-report.txt" + "data/test-abidiff/test-qual-type0-v0.cc.bi", + "data/test-abidiff/test-qual-type0-v1.cc.bi", + "data/test-abidiff/test-qual-type0-report.txt", + "output/test-abidiff/test-qual-type0-report.txt" }, { - "data/test-bidiff/test-struct0-v0.cc.bi", - "data/test-bidiff/test-struct0-v1.cc.bi", - "data/test-bidiff/test-struct0-report.txt", - "output/test-bidiff/test-struct0-report.txt" + "data/test-abidiff/test-struct0-v0.cc.bi", + "data/test-abidiff/test-struct0-v1.cc.bi", + "data/test-abidiff/test-struct0-report.txt", + "output/test-abidiff/test-struct0-report.txt" }, { - "data/test-bidiff/test-struct1-v0.cc.bi", - "data/test-bidiff/test-struct1-v1.cc.bi", - "data/test-bidiff/test-struct1-report.txt", - "output/test-bidiff/test-struct1-report.txt" + "data/test-abidiff/test-struct1-v0.cc.bi", + "data/test-abidiff/test-struct1-v1.cc.bi", + "data/test-abidiff/test-struct1-report.txt", + "output/test-abidiff/test-struct1-report.txt" }, { - "data/test-bidiff/test-var0-v0.cc.bi", - "data/test-bidiff/test-var0-v1.cc.bi", - "data/test-bidiff/test-var0-report.txt", - "output/test-bidiff/test-var0-report.txt" + "data/test-abidiff/test-var0-v0.cc.bi", + "data/test-abidiff/test-var0-v1.cc.bi", + "data/test-abidiff/test-var0-report.txt", + "output/test-abidiff/test-var0-report.txt" }, // This should be the last entry. {0, 0, 0, 0} diff --git a/tests/test-alt-dwarf-file.cc b/tests/test-alt-dwarf-file.cc index e402c25c..2b3af648 100644 --- a/tests/test-alt-dwarf-file.cc +++ b/tests/test-alt-dwarf-file.cc @@ -37,7 +37,7 @@ struct InOutSpec { const char* in_elf_path; const char* debug_info_dir_path; - const char* bidw_options; + const char* abidw_options; const char* in_report_path; const char* out_report_path; }; @@ -73,12 +73,12 @@ main() bool is_ok = true; string in_elf_path, ref_report_path, out_report_path, debug_info_dir; - string bidw, bidw_options; + string abidw, abidw_options; - bidw = get_build_dir() + "/tools/bidw"; + abidw = get_build_dir() + "/tools/abidw"; for (InOutSpec* s = in_out_specs; s->in_elf_path; ++s) { - bidw_options = s->bidw_options; + abidw_options = s->abidw_options; in_elf_path = get_src_dir() + "/tests/" + s->in_elf_path; debug_info_dir = get_src_dir() + "/tests/" + s->debug_info_dir_path; ref_report_path = get_src_dir() + "/tests/" + s->in_report_path; @@ -91,14 +91,14 @@ main() continue; } - string cmd = bidw + " --debug-info-dir " + debug_info_dir - + " " + bidw_options + " " + in_elf_path + " > " + out_report_path; + string cmd = abidw + " --debug-info-dir " + debug_info_dir + + " " + abidw_options + " " + in_elf_path + " > " + out_report_path; - bool bidw_ok = true; + bool abidw_ok = true; if (system(cmd.c_str())) - bidw_ok = false; + abidw_ok = false; - if (bidw_ok) + if (abidw_ok) { cmd = "diff -u " + ref_report_path + " " + out_report_path; if (system(cmd.c_str())) diff --git a/tests/test-diff-filter.cc b/tests/test-diff-filter.cc index 86b5870c..110a6f4e 100644 --- a/tests/test-diff-filter.cc +++ b/tests/test-diff-filter.cc @@ -26,7 +26,7 @@ /// 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. +/// is done using the abidiff command line comparison tool. /// /// The set of input files and reference reports to consider should be /// present in the source distribution. @@ -47,7 +47,7 @@ struct InOutSpec { const char* in_elfv0_path; const char* in_elfv1_path; - const char* bidiff_options; + const char* abidiff_options; const char* in_report_path; const char* out_report_path; }; // end struct InOutSpec; @@ -256,14 +256,14 @@ main() bool is_ok = true; string in_elfv0_path, in_elfv1_path, - bidiff_options, bidiff, cmd, + abidiff_options, abidiff, 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; + abidiff_options = s->abidiff_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; @@ -275,17 +275,17 @@ main() continue; } - bidiff = get_build_dir() + "/tools/bidiff"; - bidiff += " " + bidiff_options; + abidiff = get_build_dir() + "/tools/abidiff"; + abidiff += " " + abidiff_options; - cmd = bidiff + " " + in_elfv0_path + " " + in_elfv1_path; + cmd = abidiff + " " + in_elfv0_path + " " + in_elfv1_path; cmd += " > " + out_diff_report_path; - bool bidiff_ok = true; + bool abidiff_ok = true; if (system(cmd.c_str())) - bidiff_ok = false; + abidiff_ok = false; - if (bidiff_ok) + if (abidiff_ok) { cmd = "diff -u " + ref_diff_report_path + " " + out_diff_report_path; diff --git a/tests/test-lookup-syms.cc b/tests/test-lookup-syms.cc index 8c7655ea..7846d383 100644 --- a/tests/test-lookup-syms.cc +++ b/tests/test-lookup-syms.cc @@ -38,7 +38,7 @@ struct InOutSpec { const char* in_elf_path; const char* symbol; - const char* bisym_options; + const char* abisym_options; const char* in_report_path; const char* out_report_path; }; // end struct InOutSpec @@ -99,14 +99,14 @@ main() using abigail::tools::ensure_parent_dir_created; bool is_ok = true; - string in_elf_path, symbol, bisym, bisym_options, + string in_elf_path, symbol, abisym, abisym_options, ref_report_path, out_report_path; for (InOutSpec* s = in_out_specs; s->in_elf_path; ++s) { in_elf_path = get_src_dir() + "/tests/" + s->in_elf_path; symbol = s->symbol; - bisym_options = s->bisym_options; + abisym_options = s->abisym_options; ref_report_path = get_src_dir() + "/tests/" + s->in_report_path; out_report_path = get_build_dir() + "/tests/" + s->out_report_path; @@ -118,17 +118,17 @@ main() continue; } - bisym = get_build_dir() + "/tools/bisym"; - bisym += " " + bisym_options; + abisym = get_build_dir() + "/tools/abisym"; + abisym += " " + abisym_options; - string cmd = bisym + " " + in_elf_path + " " + symbol; + string cmd = abisym + " " + in_elf_path + " " + symbol; cmd += " > " + out_report_path; - bool bisym_ok = true; + bool abisym_ok = true; if (system(cmd.c_str())) - bisym_ok = false; + abisym_ok = false; - if (bisym_ok) + if (abisym_ok) { cmd = "diff -u " + ref_report_path + " "+ out_report_path; if (system(cmd.c_str())) diff --git a/tools/Makefile.am b/tools/Makefile.am index 8f3003e2..42810deb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,32 +6,32 @@ abg-tools-utils.h \ abg-tools-utils.cc if ENABLE_ZIP_ARCHIVE - bin_PROGRAMS = biar bidiff bilint bidw bisym + bin_PROGRAMS = abiar abidiff abilint abidw abisym else - bin_PROGRAMS = bidiff bilint bidw bisym + bin_PROGRAMS = abidiff abilint abidw abisym endif if ENABLE_ZIP_ARCHIVE -biar_SOURCES = biar.cc -biardir = $(bindir) -biar_LDADD = ../src/libabigail.la libtoolsutils.la +abiar_SOURCES = abiar.cc +abiardir = $(bindir) +abiar_LDADD = ../src/libabigail.la libtoolsutils.la endif -bidiff_SOURCES = bidiff.cc -bidiffdir = $(bindir) -bidiff_LDADD = ../src/libabigail.la libtoolsutils.la +abidiff_SOURCES = abidiff.cc +abidiffdir = $(bindir) +abidiff_LDADD = ../src/libabigail.la libtoolsutils.la -bilint_SOURCES = bilint.cc -bilintdir = $(bindir) -bilint_LDADD = ../src/libabigail.la libtoolsutils.la +abilint_SOURCES = abilint.cc +abilintdir = $(bindir) +abilint_LDADD = ../src/libabigail.la libtoolsutils.la -bidw_SOURCES = bidw.cc -bidwdir = $(bindir) -bidw_LDADD = ../src/libabigail.la libtoolsutils.la +abidw_SOURCES = abidw.cc +abidwdir = $(bindir) +abidw_LDADD = ../src/libabigail.la libtoolsutils.la -bisym_SOURCES = bisym.cc -bisymdir = $(bindir) -bisym_LDADD = ../src/libabigail.la +abisym_SOURCES = abisym.cc +abisymdir = $(bindir) +abisym_LDADD = ../src/libabigail.la AM_CPPFLAGS=-I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/tools diff --git a/tools/biar.cc b/tools/abiar.cc similarity index 100% rename from tools/biar.cc rename to tools/abiar.cc diff --git a/tools/bidiff.cc b/tools/abidiff.cc similarity index 100% rename from tools/bidiff.cc rename to tools/abidiff.cc diff --git a/tools/bidw.cc b/tools/abidw.cc similarity index 100% rename from tools/bidw.cc rename to tools/abidw.cc diff --git a/tools/bilint.cc b/tools/abilint.cc similarity index 100% rename from tools/bilint.cc rename to tools/abilint.cc diff --git a/tools/bisym.cc b/tools/abisym.cc similarity index 100% rename from tools/bisym.cc rename to tools/abisym.cc