From: David Malcolm <dmalcolm@redhat.com>
To: gcc-patches@gcc.gnu.org
Cc: Bernd Schmidt <bschmidt@redhat.com>, Jeff Law <law@redhat.com>,
David Malcolm <dmalcolm@redhat.com>
Subject: [PATCH 04/21] Add -fself-test-regex=
Date: Wed, 01 Jun 2016 20:54:00 -0000 [thread overview]
Message-ID: <1464816003-35862-5-git-send-email-dmalcolm@redhat.com> (raw)
In-Reply-To: <1464816003-35862-1-git-send-email-dmalcolm@redhat.com>
This patch adds a way to only run a subset of the tests,
by matching a regex against test names.
This can also be used to run just one test.
gcc/ChangeLog:
* common.opt (fself-test-regex=): New option.
* selftest.c: Include diagnostic.h, xregex.h, options.h.
(get_regerror): New function.
(selftest::run_all_tests): Rename to...
(selftest::run_tests): ...this, and add param REGEX_PATTERN,
using it to filter the tests if non-NULL.
* selftest.h (selftest::run_all_tests): Rename to...
(selftest::run_tests): ...this, adding param REGEX_PATTERN.
* toplev.c (toplev::run_self_tests): Update for above changes.
---
gcc/common.opt | 4 ++++
gcc/selftest.c | 45 ++++++++++++++++++++++++++++++++++++++++++---
gcc/selftest.h | 7 ++++---
gcc/toplev.c | 2 +-
4 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/gcc/common.opt b/gcc/common.opt
index 95376bf..6aaf8e6 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2061,6 +2061,10 @@ fself-test
Common Var(flag_self_test)
Run self-tests.
+fself-test-regex=
+Common RejectNegative Joined Var(self_test_regex)
+Run self-tests matching the given regex.
+
fsel-sched-pipelining
Common Report Var(flag_sel_sched_pipelining) Init(0) Optimization
Perform software pipelining of inner loops during selective scheduling.
diff --git a/gcc/selftest.c b/gcc/selftest.c
index 42e07e3..ada0b9b 100644
--- a/gcc/selftest.c
+++ b/gcc/selftest.c
@@ -21,12 +21,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "selftest.h"
+#include "diagnostic.h"
+#include "xregex.h"
+#include "options.h"
#if CHECKING_P
using namespace selftest;
-/* Helper function for ::selftest::run_all_tests. */
+/* Helper function for ::selftest::run_tests. */
static int
test_comparator (const void *p1, const void *p2)
@@ -36,11 +39,24 @@ test_comparator (const void *p1, const void *p2)
return strcmp (t1->get_name (), t2->get_name ());
}
-/* Locate and run all tests.
+/* Generate an error message describing a failed attempt to compile a
+ regex. The return value should be freed. */
+
+static char *
+get_regerror (int errcode, regex_t *compiled)
+{
+ size_t length = regerror (errcode, compiled, NULL, 0);
+ char *buffer = (char *)xmalloc (length);
+ (void) regerror (errcode, compiled, buffer, length);
+ return buffer;
+}
+
+/* Locate and run tests. If REGEX_PATTERN is NULL, all tests are run.
+ Otherwise, only tests with names matching the regex are run.
Return the number of failures that occurred. */
int
-selftest::run_all_tests ()
+selftest::run_tests (const char *regex_pattern)
{
/* Create all the tests, in an arbitrary order (based on
the order of construction of the global "registrator" instances). */
@@ -57,11 +73,31 @@ selftest::run_all_tests ()
/* Sort the tests into a predictable order. */
tests.qsort (test_comparator);
+ regex_t regex;
+ if (regex_pattern)
+ {
+ int errcode = regcomp (®ex, regex_pattern, 0);
+ if (errcode)
+ {
+ char *errmsg = get_regerror (errcode, ®ex);
+ error ("error compiling regex pattern %qs: %s", regex_pattern, errmsg);
+ free (errmsg);
+ return 1;
+ }
+ }
+
/* Run all the tests, in order. */
unsigned i;
test *t;
FOR_EACH_VEC_ELT (tests, i, t)
{
+ if (regex_pattern)
+ {
+ int err = regexec (®ex, t->get_name (), 0, NULL, 0);
+ if (err)
+ /* Test did not match. */
+ continue;
+ }
r.begin_test (t);
t->run ();
r.end_test (t);
@@ -71,6 +107,9 @@ selftest::run_all_tests ()
FOR_EACH_VEC_ELT (tests, i, t)
delete t;
+ if (regex_pattern)
+ regfree (®ex);
+
return r.get_num_failures ();
}
diff --git a/gcc/selftest.h b/gcc/selftest.h
index 95262ce..aa0232a 100644
--- a/gcc/selftest.h
+++ b/gcc/selftest.h
@@ -31,9 +31,10 @@ class test;
class runner;
class registrator;
-/* The entrypoint for running all tests. */
+/* The entrypoint for running all tests, or all tests matching
+ REGEX_PATTERN. */
-extern int run_all_tests ();
+extern int run_tests (const char *regex_pattern);
/* The class ::selftest::runner is responsible for gathering results,
and for output. */
@@ -93,7 +94,7 @@ class test
Global instances are created via the REGISTER_TEST below.
The constructor runs before main, wiring them up into a
singly-linked list, which can be traversed by
- ::selftest::run_all_tests. */
+ ::selftest::run_tests. */
class registrator
{
diff --git a/gcc/toplev.c b/gcc/toplev.c
index ccb9c79..e240b98 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -2069,7 +2069,7 @@ toplev::run_self_tests ()
bitmap_obstack_initialize (NULL);
/* Run the tests. */
- int result = ::selftest::run_all_tests ();
+ int result = ::selftest::run_tests (self_test_regex);
/* Ensure that a test failure leads to the process exiting with
a non-zero exit code. */
--
1.8.5.3
next prev parent reply other threads:[~2016-06-01 20:54 UTC|newest]
Thread overview: 176+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-10 15:10 [PATCH 00/17] RFC: Addding a unit testing framework to gcc David Malcolm
2015-06-10 15:10 ` [PATCH 08/17] Add test-hash-map.c to gcc/unittests David Malcolm
2015-06-10 15:10 ` [PATCH 10/17] Add test-locations.c " David Malcolm
2015-06-10 15:10 ` [PATCH 05/17] Add test-functions.c " David Malcolm
2015-06-10 15:10 ` [PATCH 07/17] Add test-gimple.c " David Malcolm
2015-06-10 15:10 ` [PATCH 12/17] Add test-tree.c " David Malcolm
2015-06-10 15:10 ` [PATCH 02/17] Add test-bitmap.c " David Malcolm
2015-06-23 19:17 ` Jeff Law
2015-06-10 15:10 ` [PATCH 01/17] Add Make-lang.in and config-lang.in " David Malcolm
2015-06-10 15:10 ` [PATCH 09/17] Add test-hash-set.c " David Malcolm
2015-06-10 15:10 ` [PATCH 04/17] Add test-folding.c " David Malcolm
2015-06-10 15:10 ` [PATCH 11/17] Add test-rtl.c " David Malcolm
2015-06-10 15:17 ` [PATCH 03/17] Add test-cfg.c " David Malcolm
2015-06-23 19:26 ` Jeff Law
2015-06-25 18:13 ` David Malcolm
2015-06-10 15:25 ` [PATCH 17/17] toplev.c: move location_adhoc_data_fini call David Malcolm
2015-06-10 15:26 ` [PATCH 16/17] Add unittests-main.c to gcc/unittests David Malcolm
2015-06-10 15:26 ` [PATCH 13/17] Add test-vec.c " David Malcolm
2015-06-10 15:28 ` [PATCH 06/17] Add test-ggc.c " David Malcolm
2015-06-10 15:28 ` [PATCH 15/17] Add unittests-frontend.c " David Malcolm
2015-06-10 15:34 ` [PATCH 14/17] Add test-wide-int.c " David Malcolm
2015-06-10 16:19 ` [PATCH 00/17] RFC: Addding a unit testing framework to gcc Jakub Jelinek
2015-06-10 16:25 ` Richard Biener
2015-06-10 17:56 ` David Malcolm
2015-06-10 23:42 ` Jakub Jelinek
2015-06-17 20:36 ` [PATCH/RFC]: unittesting v2: as a plugin (was Re: [PATCH 00/17] RFC: Addding a unit testing framework to gcc) David Malcolm
2015-06-23 19:29 ` Jeff Law
2015-10-27 19:31 ` [PATCH 00/16] Unit tests framework (v3) David Malcolm
2015-10-27 19:31 ` [PATCH 03/16] Add test-bitmap.c to unittests David Malcolm
2015-10-29 21:36 ` Jeff Law
2015-10-27 19:31 ` [PATCH 01/16] Add unittest infrastructure David Malcolm
2015-10-30 5:20 ` Jeff Law
2015-10-27 19:31 ` [PATCH 15/16] Add test-vec.c to unittests David Malcolm
2015-10-30 5:10 ` Jeff Law
2015-10-27 19:31 ` [PATCH 05/16] Add test-et-forest.c " David Malcolm
2015-10-30 4:11 ` Jeff Law
2015-10-27 19:31 ` [PATCH 11/16] Add test-hash-set.c " David Malcolm
2015-10-30 4:54 ` Jeff Law
2015-10-27 19:32 ` [PATCH 07/16] Add test-functions.c " David Malcolm
2015-10-30 5:19 ` Jeff Law
2015-10-27 19:32 ` [PATCH 10/16] Add test-hash-map.c " David Malcolm
2015-10-30 4:57 ` Jeff Law
2015-10-27 19:32 ` [PATCH 04/16] Add test-cfg.c " David Malcolm
2015-10-29 22:23 ` Jeff Law
2015-10-27 19:35 ` [PATCH 06/16] Add test-folding.c " David Malcolm
2015-10-30 5:06 ` Jeff Law
2015-10-27 19:48 ` [PATCH 14/16] Add test-tree.c " David Malcolm
2015-10-30 5:00 ` Jeff Law
2015-10-27 19:49 ` [PATCH 12/16] Add test-locations.c " David Malcolm
2015-10-30 5:09 ` Jeff Law
2015-10-27 19:49 ` [PATCH 08/16] Add test-ggc.c " David Malcolm
2015-10-30 5:08 ` Jeff Law
2015-10-27 19:50 ` [PATCH 13/16] Add test-rtl.c " David Malcolm
2015-10-30 4:58 ` Jeff Law
2015-10-31 20:36 ` Segher Boessenkool
2015-10-27 19:51 ` [PATCH 16/16] Add test-wide-int.c " David Malcolm
2015-10-30 5:15 ` Jeff Law
2015-10-27 19:58 ` [PATCH 09/16] Add test-gimple.c " David Malcolm
2015-10-28 12:39 ` Richard Biener
2015-10-28 12:44 ` Richard Biener
2015-10-28 16:22 ` Jeff Law
2015-10-30 5:02 ` Jeff Law
2015-10-27 20:16 ` [PATCH 00/16] Unit tests framework (v3) David Malcolm
2015-10-30 5:28 ` Jeff Law
2015-10-28 11:53 ` Bernd Schmidt
2015-10-28 13:02 ` Bernd Schmidt
2015-10-29 16:20 ` David Malcolm
2015-10-29 19:38 ` Jeff Law
2015-10-29 22:32 ` Mike Stump
2015-10-30 3:59 ` Jeff Law
2015-10-29 19:21 ` Jeff Law
2015-10-30 10:54 ` Bernd Schmidt
2015-10-30 16:08 ` Jeff Law
2015-11-16 18:17 ` Bernd Schmidt
2015-11-16 18:48 ` David Malcolm
2015-11-16 21:22 ` Bernd Schmidt
2015-11-16 23:12 ` Jeff Law
2015-11-17 1:54 ` Mike Stump
2015-11-17 12:51 ` Bernd Schmidt
2015-11-17 18:06 ` Jeff Law
2015-11-19 16:46 ` [PATCH 00/15] Unittests framework v4: -fself-test David Malcolm
2015-11-19 16:46 ` [PATCH 05/15] Add selftests to fold-const.c David Malcolm
2015-11-19 16:46 ` [PATCH 02/15] Add selftests to bitmap.c David Malcolm
2015-11-20 10:41 ` Richard Biener
2015-11-24 21:13 ` Jeff Law
2015-11-19 16:46 ` [PATCH 09/15] Add hash-map-tests.c David Malcolm
2015-11-19 16:46 ` [PATCH 10/15] Add hash-set-tests.c David Malcolm
2015-11-19 16:46 ` [PATCH 07/15] Fix warning in function-tests.c David Malcolm
2015-11-19 16:46 ` [PATCH 03/15] Add selftests to tree-cfg.c David Malcolm
2015-11-19 16:46 ` [PATCH 08/15] Add selftests to gimple.c David Malcolm
2015-11-19 16:46 ` [PATCH 14/15] Add selftests to vec.c David Malcolm
2015-11-19 16:46 ` [PATCH 13/15] Add selftests to tree.c David Malcolm
2015-11-19 16:46 ` [PATCH 04/15] Add selftests to et-forest.c David Malcolm
2015-11-19 16:46 ` [PATCH 15/15] RFC: Add ggc-tests.c David Malcolm
2015-11-19 16:46 ` [PATCH 01/15] Selftest framework (unittests v4) David Malcolm
2015-11-19 17:35 ` Bernd Schmidt
2015-11-19 18:08 ` David Malcolm
2015-11-19 18:15 ` Mike Stump
2015-11-19 18:44 ` Bernd Schmidt
2015-11-19 20:04 ` Mikhail Maltsev
2015-11-24 20:45 ` Jeff Law
2015-11-25 2:43 ` David Malcolm
2015-11-25 10:56 ` Bernd Schmidt
2015-11-25 16:57 ` Mike Stump
2015-11-29 18:10 ` Jeff Law
2015-11-25 22:58 ` David Malcolm
2015-11-25 7:43 ` Trevor Saunders
2015-11-25 22:53 ` David Malcolm
2015-11-26 13:00 ` Bernd Schmidt
2015-11-30 23:05 ` Jeff Law
2015-11-24 20:29 ` Jeff Law
2015-11-24 22:43 ` Jeff Law
2015-11-19 16:46 ` [PATCH 06/15] Add function-tests.c David Malcolm
2015-11-19 17:03 ` [PATCH 11/15] Add selftests to input.c David Malcolm
2015-11-19 17:03 ` [PATCH 12/15] Add rtl-tests.c David Malcolm
2016-06-01 20:54 ` [PATCH 00/21] Add -fself-test framework for fast, early unit-testing (unittests v5) David Malcolm
2016-06-01 20:54 ` [PATCH 10/21] Add selftests to fold-const.c David Malcolm
2016-06-01 20:54 ` [PATCH 01/21] Selftest framework (unittests v5) David Malcolm
2016-06-01 20:54 ` [PATCH 18/21] Add selftests to input.c David Malcolm
2016-06-01 20:54 ` [PATCH 20/21] Add selftests to tree.c David Malcolm
2016-06-01 20:54 ` [PATCH 17/21] Add hash-set-tests.c David Malcolm
2016-06-01 20:54 ` [PATCH 02/21] Makefile.in integration David Malcolm
2016-06-01 20:54 ` [PATCH 09/21] Add selftests to et-forest.c David Malcolm
2016-06-01 20:54 ` [PATCH 03/21] Various selftest::runner tweaks David Malcolm
2016-06-01 20:54 ` [PATCH 07/21] Add selftests to bitmap.c David Malcolm
2016-06-01 20:54 ` David Malcolm [this message]
2016-06-01 21:09 ` [PATCH 12/21] Fix warning in function-tests.c David Malcolm
2016-06-01 21:10 ` [PATCH 08/21] Add selftests to tree-cfg.c David Malcolm
2016-06-01 21:10 ` [PATCH 11/21] Add function-tests.c David Malcolm
2016-06-01 21:10 ` [PATCH 06/21] Convert Levenshtein test from a plugin to a selftest David Malcolm
2016-06-01 21:10 ` [PATCH 21/21] Add selftests to vec.c David Malcolm
2016-06-01 21:11 ` [PATCH 16/21] Add hash-map-tests.c David Malcolm
2016-06-01 21:20 ` [PATCH 00/21] Add -fself-test framework for fast, early unit-testing (unittests v5) Sandra Loosemore
2016-06-02 13:08 ` David Malcolm
2016-06-01 21:21 ` [PATCH 05/21] Add selftests for diagnostic-show-locus.c David Malcolm
2016-06-01 21:22 ` [PATCH 19/21] Add rtl-tests.c David Malcolm
2016-06-01 21:23 ` [PATCH 15/21] Add selftests to gimple.c David Malcolm
2016-06-01 21:26 ` [PATCH 14/21] Remove x86_64-isms in function-tests.c David Malcolm
2016-06-01 21:29 ` [PATCH 13/21] Fixup to function-tests.c David Malcolm
2016-06-02 10:30 ` [PATCH 00/21] Add -fself-test framework for fast, early unit-testing (unittests v5) Bernd Schmidt
2016-06-02 13:41 ` David Malcolm
2016-06-02 20:41 ` [PATCH 00/16] v6 of -fself-test/unit-testing patch David Malcolm
2016-06-02 20:41 ` [PATCH 01/16] Core of selftest framework (v6) David Malcolm
2016-06-02 23:21 ` Bernd Schmidt
2016-06-03 18:47 ` [PATCH] Selftest framework (v7) David Malcolm
2016-06-05 11:38 ` Bernd Schmidt
2016-06-06 14:17 ` David Malcolm
2016-06-06 14:41 ` Bernd Schmidt
2016-06-06 17:18 ` [Committed] Selftest framework (v8) David Malcolm
2016-06-06 21:47 ` [PATCH] Selftest framework (v7) Trevor Saunders
2016-06-06 21:57 ` Jakub Jelinek
2016-06-07 2:07 ` Trevor Saunders
2016-06-07 14:18 ` David Malcolm
2016-06-08 0:23 ` Trevor Saunders
2016-06-02 20:41 ` [PATCH 10/16] Add hash-map-tests.c David Malcolm
2016-06-02 20:41 ` [PATCH 02/16] diagnostic-show-locus.c: add selftests David Malcolm
2016-06-02 20:41 ` [PATCH 03/16] spellcheck.c: convert Levenshtein test from a plugin to a selftest David Malcolm
2016-06-02 20:41 ` [PATCH 04/16] bitmap.c: add selftests David Malcolm
2016-06-02 20:41 ` [PATCH 05/16] tree-cfg.c: " David Malcolm
2016-06-02 20:41 ` [PATCH 09/16] gimple.c: " David Malcolm
2016-06-02 20:57 ` [PATCH 08/16] Add function-tests.c David Malcolm
2016-06-02 20:58 ` [PATCH 14/16] tree.c: add selftests David Malcolm
2016-06-02 21:03 ` [PATCH 12/16] input.c: " David Malcolm
2016-06-02 21:03 ` [PATCH 13/16] Add rtl-tests.c David Malcolm
2016-06-02 21:03 ` [PATCH 16/16] wide-int.cc: add selftests David Malcolm
2016-06-02 21:06 ` [PATCH 15/16] vec.c: " David Malcolm
2016-06-02 21:09 ` [PATCH 07/16] fold-const.c: " David Malcolm
2016-06-02 21:09 ` [PATCH 11/16] Add hash-set-tests.c David Malcolm
2016-06-02 21:09 ` [PATCH 06/16] et-forest.c: add selftests David Malcolm
2015-10-28 16:05 ` [PATCH 00/16] Unit tests framework (v3) Jeff Law
2015-10-28 20:26 ` Mike Stump
2015-06-23 19:06 ` [PATCH 00/17] RFC: Addding a unit testing framework to gcc Jeff Law
2015-06-23 20:04 ` Mike Stump
2015-06-10 18:21 ` David Malcolm
2015-06-10 22:15 ` Jakub Jelinek
2015-06-11 14:49 ` Martin Liška
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=1464816003-35862-5-git-send-email-dmalcolm@redhat.com \
--to=dmalcolm@redhat.com \
--cc=bschmidt@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=law@redhat.com \
/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).