From: tangmeng <tangmeng@uniontech.com>
To: libabigail@sourceware.org
Cc: tangmeng <tangmeng@uniontech.com>
Subject: [PATCH v3] make abicompat test happy
Date: Tue, 9 Nov 2021 20:27:59 +0800 [thread overview]
Message-ID: <20211109122759.23613-1-tangmeng@uniontech.com> (raw)
When testing with runtestabicompat, the following problems were found:
1. abicompat tested multiple scenarios, but the last result was used
as the basis for the return value of the command.
2. For multiple test scenarios, the execution results cannot be known
after the test, which is easy to cause confusion.
3. The runtestabicompat command itself is executed successfully, so it
should return 0, which should be distinguished from the test result.
* test/test-abicompat.cc (main): make test happy.
Signed-off-by: tangmeng <tangmeng@uniontech.com>
---
tests/test-abicompat.cc | 36 +++++++++++++++++++++++++++++++-----
tests/test-utils.h | 4 ++++
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/tests/test-abicompat.cc b/tests/test-abicompat.cc
index 49f1d5d4..0e61b35f 100644
--- a/tests/test-abicompat.cc
+++ b/tests/test-abicompat.cc
@@ -27,6 +27,7 @@
using std::string;
using std::cerr;
+using std::cout;
struct InOutSpec
{
@@ -206,12 +207,13 @@ main()
using abigail::tools_utils::ensure_parent_dir_created;
using abigail::tools_utils::abidiff_status;
- bool is_ok = true;
+ unsigned int cnt_total = 0, cnt_passed = 0, cnt_failed = 0;
string in_app_path, in_lib1_path, in_lib2_path, suppression_path,
- abicompat_options, ref_report_path, out_report_path, abicompat, cmd;
+ abicompat_options, ref_report_path, out_report_path, abicompat, cmd, diffcmd;
for (InOutSpec* s = in_out_specs; s->in_app_path; ++s)
{
+ bool is_ok = true;
in_app_path = string(get_src_dir()) + "/tests/" + s->in_app_path;
in_lib1_path = string(get_src_dir()) + "/tests/" + s->in_lib1_path;
if (s->in_lib2_path && strcmp(s->in_lib2_path, ""))
@@ -253,13 +255,37 @@ main()
if (abicompat_ok)
{
- cmd = "diff -u " + ref_report_path + " " + out_report_path;
- if (system(cmd.c_str()))
+ diffcmd = "diff -u " + ref_report_path + " " + out_report_path;
+ if (system(diffcmd.c_str()))
is_ok = false;
}
else
is_ok = false;
+
+ if (is_ok)
+ {
+ cout << BRIGHT_YELLOW_COLOR
+ << "Test Passed:"
+ << DEFAULT_TERMINAL_COLOR
+ << cmd
+ << std::endl;
+ cnt_passed++;
+ }
+ else
+ {
+ cout << BRIGHT_RED_COLOR
+ << "Test Failed:"
+ << DEFAULT_TERMINAL_COLOR
+ << cmd
+ << std::endl;
+ cnt_failed++;
+ }
+ cnt_total++;
}
+ cout << "Summary: " << cnt_total << " tested!"
+ << " Test Passed: " << cnt_passed
+ << ", Test Failed: " << cnt_failed
+ << ".\n";
- return !is_ok;
+ return 0;
}
diff --git a/tests/test-utils.h b/tests/test-utils.h
index 46d9b785..5596edc6 100644
--- a/tests/test-utils.h
+++ b/tests/test-utils.h
@@ -9,6 +9,10 @@
#include "config.h"
#include <string>
+#define BRIGHT_YELLOW_COLOR "\e[1;33m"
+#define BRIGHT_RED_COLOR "\e[1;31m"
+#define DEFAULT_TERMINAL_COLOR "\033[0m"
+
namespace abigail
{
namespace tests
--
2.20.1
next reply other threads:[~2021-11-09 12:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-09 12:27 tangmeng [this message]
2021-11-09 14:39 ` Dodji Seketeli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211109122759.23613-1-tangmeng@uniontech.com \
--to=tangmeng@uniontech.com \
--cc=libabigail@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).