From patchwork Mon Apr 6 08:44:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 39078 From: gprocida@google.com (Giuliano Procida) Date: Mon, 6 Apr 2020 09:44:49 +0100 Subject: [PATCH 1/2] Rename test-abidiff-exit/test-leaf[0-3] files. Message-ID: <20200406084450.140975-1-gprocida@google.com> The files tests/data/test-abidiff-exit/test-leaf[0-3]-* were introduced in a series of changes. Numbering rather than naming the tests turned out to be a bad choice: it caused confusion when dealing with merge conflicts due to reordering of commits. This patch renames the tests to give them more descriptive names, which is good practice anyway. * tests/data/Makefile.am: Rename test files. * tests/test-abidiff-exit.cc: Rename test files. * tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt: Renamed from test-leaf2-report.txt. * tests/data/test-abidiff-exit/test-leaf-fun-type-v0.cc: Renamed from test-leaf2-v0.cc. * tests/data/test-abidiff-exit/test-leaf-fun-type-v0.o: Renamed from test-leaf2-v0.o. * tests/data/test-abidiff-exit/test-leaf-fun-type-v1.cc: Renamed from test-leaf2-v1.cc. * tests/data/test-abidiff-exit/test-leaf-fun-type-v1.o: Renamed from test-leaf2-v1.o. * tests/data/test-abidiff-exit/test-leaf-more-report.txt: Renamed from test-leaf1-report.txt. * tests/data/test-abidiff-exit/test-leaf-more-v0.cc: Renamed from test-leaf1-v0.cc. * tests/data/test-abidiff-exit/test-leaf-more-v0.o: Renamed from test-leaf1-v0.o. * tests/data/test-abidiff-exit/test-leaf-more-v1.cc: Renamed from test-leaf1-v1.cc. * tests/data/test-abidiff-exit/test-leaf-more-v1.o: Renamed from test-leaf1-v1.o. * tests/data/test-abidiff-exit/test-leaf-redundant-report.txt: Renamed from test-leaf3-report.txt. * tests/data/test-abidiff-exit/test-leaf-redundant-v0.c: Renamed from test-leaf3-v0.c. * tests/data/test-abidiff-exit/test-leaf-redundant-v0.o: Renamed from test-leaf3-v0.o. * tests/data/test-abidiff-exit/test-leaf-redundant-v1.c: Renamed from test-leaf3-v1.c. * tests/data/test-abidiff-exit/test-leaf-redundant-v1.o: Renamed from test-leaf3-v1.o. * tests/data/test-abidiff-exit/test-leaf-stats-report.txt: Renamed from test-leaf0-report.txt. * tests/data/test-abidiff-exit/test-leaf-stats-v0.cc: Renamed from test-leaf0-v0.cc. * tests/data/test-abidiff-exit/test-leaf-stats-v0.o: Renamed from test-leaf0-v0.o. * tests/data/test-abidiff-exit/test-leaf-stats-v1.cc: Renamed from test-leaf0-v1.cc. * tests/data/test-abidiff-exit/test-leaf-stats-v1.o: Renamed from test-leaf0-v1.o. Signed-off-by: Giuliano Procida Reviewed-by: Matthias Maennich --- tests/data/Makefile.am | 40 +++++++++--------- ...port.txt => test-leaf-fun-type-report.txt} | 0 ...t-leaf2-v0.cc => test-leaf-fun-type-v0.cc} | 0 ...est-leaf2-v0.o => test-leaf-fun-type-v0.o} | Bin ...t-leaf2-v1.cc => test-leaf-fun-type-v1.cc} | 0 ...est-leaf2-v1.o => test-leaf-fun-type-v1.o} | Bin ...1-report.txt => test-leaf-more-report.txt} | 0 ...{test-leaf1-v0.cc => test-leaf-more-v0.cc} | 0 .../{test-leaf1-v0.o => test-leaf-more-v0.o} | Bin ...{test-leaf1-v1.cc => test-leaf-more-v1.cc} | 0 .../{test-leaf1-v1.o => test-leaf-more-v1.o} | Bin ...ort.txt => test-leaf-redundant-report.txt} | 0 ...st-leaf3-v0.c => test-leaf-redundant-v0.c} | 0 ...st-leaf3-v0.o => test-leaf-redundant-v0.o} | Bin ...st-leaf3-v1.c => test-leaf-redundant-v1.c} | 0 ...st-leaf3-v1.o => test-leaf-redundant-v1.o} | Bin ...-report.txt => test-leaf-stats-report.txt} | 0 ...test-leaf0-v0.cc => test-leaf-stats-v0.cc} | 0 .../{test-leaf0-v0.o => test-leaf-stats-v0.o} | Bin ...test-leaf0-v1.cc => test-leaf-stats-v1.cc} | 0 .../{test-leaf0-v1.o => test-leaf-stats-v1.o} | Bin tests/test-abidiff-exit.cc | 32 +++++++------- 22 files changed, 36 insertions(+), 36 deletions(-) rename tests/data/test-abidiff-exit/{test-leaf2-report.txt => test-leaf-fun-type-report.txt} (100%) rename tests/data/test-abidiff-exit/{test-leaf2-v0.cc => test-leaf-fun-type-v0.cc} (100%) rename tests/data/test-abidiff-exit/{test-leaf2-v0.o => test-leaf-fun-type-v0.o} (100%) rename tests/data/test-abidiff-exit/{test-leaf2-v1.cc => test-leaf-fun-type-v1.cc} (100%) rename tests/data/test-abidiff-exit/{test-leaf2-v1.o => test-leaf-fun-type-v1.o} (100%) rename tests/data/test-abidiff-exit/{test-leaf1-report.txt => test-leaf-more-report.txt} (100%) rename tests/data/test-abidiff-exit/{test-leaf1-v0.cc => test-leaf-more-v0.cc} (100%) rename tests/data/test-abidiff-exit/{test-leaf1-v0.o => test-leaf-more-v0.o} (100%) rename tests/data/test-abidiff-exit/{test-leaf1-v1.cc => test-leaf-more-v1.cc} (100%) rename tests/data/test-abidiff-exit/{test-leaf1-v1.o => test-leaf-more-v1.o} (100%) rename tests/data/test-abidiff-exit/{test-leaf3-report.txt => test-leaf-redundant-report.txt} (100%) rename tests/data/test-abidiff-exit/{test-leaf3-v0.c => test-leaf-redundant-v0.c} (100%) rename tests/data/test-abidiff-exit/{test-leaf3-v0.o => test-leaf-redundant-v0.o} (100%) rename tests/data/test-abidiff-exit/{test-leaf3-v1.c => test-leaf-redundant-v1.c} (100%) rename tests/data/test-abidiff-exit/{test-leaf3-v1.o => test-leaf-redundant-v1.o} (100%) rename tests/data/test-abidiff-exit/{test-leaf0-report.txt => test-leaf-stats-report.txt} (100%) rename tests/data/test-abidiff-exit/{test-leaf0-v0.cc => test-leaf-stats-v0.cc} (100%) rename tests/data/test-abidiff-exit/{test-leaf0-v0.o => test-leaf-stats-v0.o} (100%) rename tests/data/test-abidiff-exit/{test-leaf0-v1.cc => test-leaf-stats-v1.cc} (100%) rename tests/data/test-abidiff-exit/{test-leaf0-v1.o => test-leaf-stats-v1.o} (100%) diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 64e36b1a..6e926ebd 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -110,26 +110,26 @@ test-abidiff-exit/test-loc-without-locs-report.txt \ test-abidiff-exit/test-no-stray-comma-report.txt \ test-abidiff-exit/test-no-stray-comma-v0.o \ test-abidiff-exit/test-no-stray-comma-v1.o \ -test-abidiff-exit/test-leaf0-v0.cc \ -test-abidiff-exit/test-leaf0-v0.o \ -test-abidiff-exit/test-leaf0-v1.cc \ -test-abidiff-exit/test-leaf0-v1.o \ -test-abidiff-exit/test-leaf0-report.txt \ -test-abidiff-exit/test-leaf1-v0.cc \ -test-abidiff-exit/test-leaf1-v0.o \ -test-abidiff-exit/test-leaf1-v1.cc \ -test-abidiff-exit/test-leaf1-v1.o \ -test-abidiff-exit/test-leaf1-report.txt \ -test-abidiff-exit/test-leaf2-v0.cc \ -test-abidiff-exit/test-leaf2-v0.o \ -test-abidiff-exit/test-leaf2-v1.cc \ -test-abidiff-exit/test-leaf2-v1.o \ -test-abidiff-exit/test-leaf2-report.txt \ -test-abidiff-exit/test-leaf3-v0.c \ -test-abidiff-exit/test-leaf3-v0.o \ -test-abidiff-exit/test-leaf3-v1.c \ -test-abidiff-exit/test-leaf3-v1.o \ -test-abidiff-exit/test-leaf3-report.txt \ +test-abidiff-exit/test-leaf-stats-v0.cc \ +test-abidiff-exit/test-leaf-stats-v0.o \ +test-abidiff-exit/test-leaf-stats-v1.cc \ +test-abidiff-exit/test-leaf-stats-v1.o \ +test-abidiff-exit/test-leaf-stats-report.txt \ +test-abidiff-exit/test-leaf-more-v0.cc \ +test-abidiff-exit/test-leaf-more-v0.o \ +test-abidiff-exit/test-leaf-more-v1.cc \ +test-abidiff-exit/test-leaf-more-v1.o \ +test-abidiff-exit/test-leaf-more-report.txt \ +test-abidiff-exit/test-leaf-fun-type-v0.cc \ +test-abidiff-exit/test-leaf-fun-type-v0.o \ +test-abidiff-exit/test-leaf-fun-type-v1.cc \ +test-abidiff-exit/test-leaf-fun-type-v1.o \ +test-abidiff-exit/test-leaf-fun-type-report.txt \ +test-abidiff-exit/test-leaf-redundant-v0.c \ +test-abidiff-exit/test-leaf-redundant-v0.o \ +test-abidiff-exit/test-leaf-redundant-v1.c \ +test-abidiff-exit/test-leaf-redundant-v1.o \ +test-abidiff-exit/test-leaf-redundant-report.txt \ test-abidiff-exit/test-leaf-peeling-v0.cc \ test-abidiff-exit/test-leaf-peeling-v0.o \ test-abidiff-exit/test-leaf-peeling-v1.cc \ diff --git a/tests/data/test-abidiff-exit/test-leaf2-report.txt b/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf2-report.txt rename to tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt diff --git a/tests/data/test-abidiff-exit/test-leaf2-v0.cc b/tests/data/test-abidiff-exit/test-leaf-fun-type-v0.cc similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf2-v0.cc rename to tests/data/test-abidiff-exit/test-leaf-fun-type-v0.cc diff --git a/tests/data/test-abidiff-exit/test-leaf2-v0.o b/tests/data/test-abidiff-exit/test-leaf-fun-type-v0.o similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf2-v0.o rename to tests/data/test-abidiff-exit/test-leaf-fun-type-v0.o diff --git a/tests/data/test-abidiff-exit/test-leaf2-v1.cc b/tests/data/test-abidiff-exit/test-leaf-fun-type-v1.cc similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf2-v1.cc rename to tests/data/test-abidiff-exit/test-leaf-fun-type-v1.cc diff --git a/tests/data/test-abidiff-exit/test-leaf2-v1.o b/tests/data/test-abidiff-exit/test-leaf-fun-type-v1.o similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf2-v1.o rename to tests/data/test-abidiff-exit/test-leaf-fun-type-v1.o diff --git a/tests/data/test-abidiff-exit/test-leaf1-report.txt b/tests/data/test-abidiff-exit/test-leaf-more-report.txt similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf1-report.txt rename to tests/data/test-abidiff-exit/test-leaf-more-report.txt diff --git a/tests/data/test-abidiff-exit/test-leaf1-v0.cc b/tests/data/test-abidiff-exit/test-leaf-more-v0.cc similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf1-v0.cc rename to tests/data/test-abidiff-exit/test-leaf-more-v0.cc diff --git a/tests/data/test-abidiff-exit/test-leaf1-v0.o b/tests/data/test-abidiff-exit/test-leaf-more-v0.o similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf1-v0.o rename to tests/data/test-abidiff-exit/test-leaf-more-v0.o diff --git a/tests/data/test-abidiff-exit/test-leaf1-v1.cc b/tests/data/test-abidiff-exit/test-leaf-more-v1.cc similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf1-v1.cc rename to tests/data/test-abidiff-exit/test-leaf-more-v1.cc diff --git a/tests/data/test-abidiff-exit/test-leaf1-v1.o b/tests/data/test-abidiff-exit/test-leaf-more-v1.o similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf1-v1.o rename to tests/data/test-abidiff-exit/test-leaf-more-v1.o diff --git a/tests/data/test-abidiff-exit/test-leaf3-report.txt b/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf3-report.txt rename to tests/data/test-abidiff-exit/test-leaf-redundant-report.txt diff --git a/tests/data/test-abidiff-exit/test-leaf3-v0.c b/tests/data/test-abidiff-exit/test-leaf-redundant-v0.c similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf3-v0.c rename to tests/data/test-abidiff-exit/test-leaf-redundant-v0.c diff --git a/tests/data/test-abidiff-exit/test-leaf3-v0.o b/tests/data/test-abidiff-exit/test-leaf-redundant-v0.o similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf3-v0.o rename to tests/data/test-abidiff-exit/test-leaf-redundant-v0.o diff --git a/tests/data/test-abidiff-exit/test-leaf3-v1.c b/tests/data/test-abidiff-exit/test-leaf-redundant-v1.c similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf3-v1.c rename to tests/data/test-abidiff-exit/test-leaf-redundant-v1.c diff --git a/tests/data/test-abidiff-exit/test-leaf3-v1.o b/tests/data/test-abidiff-exit/test-leaf-redundant-v1.o similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf3-v1.o rename to tests/data/test-abidiff-exit/test-leaf-redundant-v1.o diff --git a/tests/data/test-abidiff-exit/test-leaf0-report.txt b/tests/data/test-abidiff-exit/test-leaf-stats-report.txt similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf0-report.txt rename to tests/data/test-abidiff-exit/test-leaf-stats-report.txt diff --git a/tests/data/test-abidiff-exit/test-leaf0-v0.cc b/tests/data/test-abidiff-exit/test-leaf-stats-v0.cc similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf0-v0.cc rename to tests/data/test-abidiff-exit/test-leaf-stats-v0.cc diff --git a/tests/data/test-abidiff-exit/test-leaf0-v0.o b/tests/data/test-abidiff-exit/test-leaf-stats-v0.o similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf0-v0.o rename to tests/data/test-abidiff-exit/test-leaf-stats-v0.o diff --git a/tests/data/test-abidiff-exit/test-leaf0-v1.cc b/tests/data/test-abidiff-exit/test-leaf-stats-v1.cc similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf0-v1.cc rename to tests/data/test-abidiff-exit/test-leaf-stats-v1.cc diff --git a/tests/data/test-abidiff-exit/test-leaf0-v1.o b/tests/data/test-abidiff-exit/test-leaf-stats-v1.o similarity index 100% rename from tests/data/test-abidiff-exit/test-leaf0-v1.o rename to tests/data/test-abidiff-exit/test-leaf-stats-v1.o diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc index 97981a69..af3711b2 100644 --- a/tests/test-abidiff-exit.cc +++ b/tests/test-abidiff-exit.cc @@ -121,42 +121,42 @@ InOutSpec in_out_specs[] = "output/test-abidiff-exit/test-no-stray-comma-report.txt" }, { - "data/test-abidiff-exit/test-leaf0-v0.o", - "data/test-abidiff-exit/test-leaf0-v1.o", + "data/test-abidiff-exit/test-leaf-stats-v0.o", + "data/test-abidiff-exit/test-leaf-stats-v1.o", "", "--no-show-locs --leaf-changes-only", abigail::tools_utils::ABIDIFF_ABI_CHANGE, - "data/test-abidiff-exit/test-leaf0-report.txt", - "output/test-abidiff-exit/test-leaf0-report.txt" + "data/test-abidiff-exit/test-leaf-stats-report.txt", + "output/test-abidiff-exit/test-leaf-stats-report.txt" }, { - "data/test-abidiff-exit/test-leaf1-v0.o", - "data/test-abidiff-exit/test-leaf1-v1.o", + "data/test-abidiff-exit/test-leaf-more-v0.o", + "data/test-abidiff-exit/test-leaf-more-v1.o", "", // --redundant - pending a bug fix "--no-show-locs --leaf-changes-only --redundant", abigail::tools_utils::ABIDIFF_ABI_CHANGE | abigail::tools_utils::ABIDIFF_ABI_INCOMPATIBLE_CHANGE, - "data/test-abidiff-exit/test-leaf1-report.txt", - "output/test-abidiff-exit/test-leaf1-report.txt" + "data/test-abidiff-exit/test-leaf-more-report.txt", + "output/test-abidiff-exit/test-leaf-more-report.txt" }, { - "data/test-abidiff-exit/test-leaf2-v0.o", - "data/test-abidiff-exit/test-leaf2-v1.o", + "data/test-abidiff-exit/test-leaf-fun-type-v0.o", + "data/test-abidiff-exit/test-leaf-fun-type-v1.o", "", "--no-show-locs --leaf-changes-only", abigail::tools_utils::ABIDIFF_ABI_CHANGE, - "data/test-abidiff-exit/test-leaf2-report.txt", - "output/test-abidiff-exit/test-leaf2-report.txt" + "data/test-abidiff-exit/test-leaf-fun-type-report.txt", + "output/test-abidiff-exit/test-leaf-fun-type-report.txt" }, { - "data/test-abidiff-exit/test-leaf3-v0.o", - "data/test-abidiff-exit/test-leaf3-v1.o", + "data/test-abidiff-exit/test-leaf-redundant-v0.o", + "data/test-abidiff-exit/test-leaf-redundant-v1.o", "", "--leaf-changes-only", abigail::tools_utils::ABIDIFF_ABI_CHANGE, - "data/test-abidiff-exit/test-leaf3-report.txt", - "output/test-abidiff-exit/test-leaf3-report.txt" + "data/test-abidiff-exit/test-leaf-redundant-report.txt", + "output/test-abidiff-exit/test-leaf-redundant-report.txt" }, { "data/test-abidiff-exit/test-leaf-peeling-v0.o", From patchwork Mon Apr 6 08:44:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 39079 From: gprocida@google.com (Giuliano Procida) Date: Mon, 6 Apr 2020 09:44:50 +0100 Subject: [PATCH 2/2] test-abidiff-exit.cc: Drop redundant --redundant. In-Reply-To: <20200406084450.140975-1-gprocida@google.com> References: <20200406084450.140975-1-gprocida@google.com> Message-ID: <20200406084450.140975-2-gprocida@google.com> * tests/test-abidiff-exit.cc: Drop obsolete --redundant flag and comment as --redundant is now implied by --leaf-changes-only. Signed-off-by: Giuliano Procida Reviewed-by: Matthias Maennich --- tests/test-abidiff-exit.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc index af3711b2..25f58b34 100644 --- a/tests/test-abidiff-exit.cc +++ b/tests/test-abidiff-exit.cc @@ -133,8 +133,7 @@ InOutSpec in_out_specs[] = "data/test-abidiff-exit/test-leaf-more-v0.o", "data/test-abidiff-exit/test-leaf-more-v1.o", "", - // --redundant - pending a bug fix - "--no-show-locs --leaf-changes-only --redundant", + "--no-show-locs --leaf-changes-only", abigail::tools_utils::ABIDIFF_ABI_CHANGE | abigail::tools_utils::ABIDIFF_ABI_INCOMPATIBLE_CHANGE, "data/test-abidiff-exit/test-leaf-more-report.txt",