public inbox for libabigail@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 1/2] Rename test-abidiff-exit/test-leaf[0-3] files.
@ 2020-04-06  8:44 Giuliano Procida
  2020-04-06  8:44 ` [PATCH 2/2] test-abidiff-exit.cc: Drop redundant --redundant Giuliano Procida
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Giuliano Procida @ 2020-04-06  8:44 UTC (permalink / raw)
  To: libabigail; +Cc: dodji, kernel-team, gprocida

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 <gprocida@google.com>
---
 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",
-- 
2.26.0.292.g33ef6b2f38-goog


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-04-07 13:22 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-06  8:44 [PATCH 1/2] Rename test-abidiff-exit/test-leaf[0-3] files Giuliano Procida
2020-04-06  8:44 ` [PATCH 2/2] test-abidiff-exit.cc: Drop redundant --redundant Giuliano Procida
2020-04-06 11:25   ` Matthias Maennich
2020-04-07 13:22   ` Dodji Seketeli
2020-04-06 11:24 ` [PATCH 1/2] Rename test-abidiff-exit/test-leaf[0-3] files Matthias Maennich
2020-04-07 13:22 ` Dodji Seketeli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).