* [PATCH, committed] jit.exp: add __func__ to help test-{combination|threads}.c
@ 2015-01-07 16:06 David Malcolm
0 siblings, 0 replies; only message in thread
From: David Malcolm @ 2015-01-07 16:06 UTC (permalink / raw)
To: jit, gcc-patches; +Cc: David Malcolm
Within the jit testsuite, test-combination.c and test-threads.c rerun
other tests - the former all within one context, the latter in multiple
contexts, each on a different thread.
When reading the results of these combined tests it can be difficult to
figure out where each PASS/FAIL line actually comes from.
Address this by adding __func__ to the output.
jit.sum remains:
# of expected passes 5008
Committed to trunk as r219314.
gcc/testsuite/ChangeLog:
* jit.dg/harness.h (CHECK_NON_NULL): Add __func__ to output, to
make it easier to figure out the origin of each test result when
running test-combination.c and test-threads.c.
(CHECK_VALUE): Likewise.
(CHECK_DOUBLE_VALUE): Likewise.
(CHECK_STRING_VALUE): Likewise.
(CHECK_STRING_STARTS_WITH): Likewise.
(CHECK_STRING_CONTAINS): Likewise.
(CHECK): Likewise.
(check_string_value): Likewise, add "funcname" param.
(check_string_starts_with): Likewise.
(check_string_contains): Likewise.
---
gcc/testsuite/jit.dg/harness.h | 78 +++++++++++++++++++++++++-----------------
1 file changed, 47 insertions(+), 31 deletions(-)
diff --git a/gcc/testsuite/jit.dg/harness.h b/gcc/testsuite/jit.dg/harness.h
index 19dabb5..fda797c 100644
--- a/gcc/testsuite/jit.dg/harness.h
+++ b/gcc/testsuite/jit.dg/harness.h
@@ -39,11 +39,13 @@ static char test[1024];
do { \
if ((PTR) != NULL) \
{ \
- pass ("%s: %s is non-null", test, #PTR); \
+ pass ("%s: %s: %s is non-null", \
+ test, __func__, #PTR); \
} \
else \
{ \
- fail ("%s: %s is NULL", test, #PTR); \
+ fail ("%s: %s: %s is NULL", \
+ test, __func__, #PTR); \
abort (); \
} \
} while (0)
@@ -52,11 +54,13 @@ static char test[1024];
do { \
if ((ACTUAL) == (EXPECTED)) \
{ \
- pass ("%s: actual: %s == expected: %s", test, #ACTUAL, #EXPECTED); \
+ pass ("%s: %s: actual: %s == expected: %s", \
+ test, __func__, #ACTUAL, #EXPECTED); \
} \
else \
{ \
- fail ("%s: actual: %s != expected: %s", test, #ACTUAL, #EXPECTED); \
+ fail ("%s: %s: actual: %s != expected: %s", \
+ test, __func__, #ACTUAL, #EXPECTED); \
fprintf (stderr, "incorrect value\n"); \
abort (); \
} \
@@ -68,34 +72,36 @@ static char test[1024];
double actual = (ACTUAL); \
if (abs (actual - expected) < 0.00001) \
{ \
- pass ("%s: actual: %s == expected: %s", test, #ACTUAL, #EXPECTED); \
+ pass ("%s: %s: actual: %s == expected: %s", \
+ __func__, test, #ACTUAL, #EXPECTED); \
} \
else \
{ \
- fail ("%s: actual: %s != expected: %s", test, #ACTUAL, #EXPECTED); \
+ fail ("%s: %s: actual: %s != expected: %s", \
+ __func__, test, #ACTUAL, #EXPECTED); \
fprintf (stderr, "incorrect value: %f\n", actual); \
abort (); \
} \
} while (0)
#define CHECK_STRING_VALUE(ACTUAL, EXPECTED) \
- check_string_value ((ACTUAL), (EXPECTED));
+ check_string_value (__func__, (ACTUAL), (EXPECTED));
#define CHECK_STRING_STARTS_WITH(ACTUAL, EXPECTED_PREFIX) \
- check_string_starts_with ((ACTUAL), (EXPECTED_PREFIX));
+ check_string_starts_with (__func__, (ACTUAL), (EXPECTED_PREFIX));
#define CHECK_STRING_CONTAINS(ACTUAL, EXPECTED_SUBSTRING) \
- check_string_contains (#ACTUAL, (ACTUAL), (EXPECTED_SUBSTRING));
+ check_string_contains (__func__, #ACTUAL, (ACTUAL), (EXPECTED_SUBSTRING));
#define CHECK(COND) \
do { \
if (COND) \
{ \
- pass ("%s: %s", test, #COND); \
+ pass ("%s: %s: %s", test, __func__, #COND); \
} \
else \
{ \
- fail ("%s: %s", test, #COND); \
+ fail ("%s: %s: %s", test, __func__, #COND); \
abort (); \
} \
} while (0)
@@ -107,14 +113,17 @@ create_code (gcc_jit_context *ctxt, void * user_data);
extern void
verify_code (gcc_jit_context *ctxt, gcc_jit_result *result);
-extern void check_string_value (const char *actual, const char *expected);
+extern void check_string_value (const char *funcname,
+ const char *actual, const char *expected);
extern void
-check_string_starts_with (const char *actual,
+check_string_starts_with (const char *funcname,
+ const char *actual,
const char *expected_prefix);
extern void
-check_string_contains (const char *name,
+check_string_contains (const char *funcname,
+ const char *name,
const char *actual,
const char *expected_substring);
@@ -124,17 +133,20 @@ check_string_contains (const char *name,
temporarily turning off this part of harness.h. */
#ifndef COMBINED_TEST
-void check_string_value (const char *actual, const char *expected)
+void check_string_value (const char *funcname,
+ const char *actual, const char *expected)
{
if (actual && !expected)
{
- fail ("%s: actual: \"%s\" != expected: NULL", test, actual);
+ fail ("%s: %s: actual: \"%s\" != expected: NULL",
+ funcname, test, actual);
fprintf (stderr, "incorrect value\n");
abort ();
}
if (expected && !actual)
{
- fail ("%s: actual: NULL != expected: \"%s\"", test, expected);
+ fail ("%s: %s: actual: NULL != expected: \"%s\"",
+ funcname, test, expected);
fprintf (stderr, "incorrect value\n");
abort ();
}
@@ -142,32 +154,35 @@ void check_string_value (const char *actual, const char *expected)
{
if (strcmp (actual, expected))
{
- fail ("%s: actual: \"%s\" != expected: \"%s\"", test, actual, expected);
+ fail ("%s: %s: actual: \"%s\" != expected: \"%s\"",
+ test, funcname, actual, expected);
fprintf (stderr, "incorrect valuen");
abort ();
}
- pass ("%s: actual: \"%s\" == expected: \"%s\"", test, actual, expected);
+ pass ("%s: %s: actual: \"%s\" == expected: \"%s\"",
+ test, funcname, actual, expected);
}
else
pass ("%s: actual: NULL == expected: NULL");
}
void
-check_string_starts_with (const char *actual,
+check_string_starts_with (const char *funcname,
+ const char *actual,
const char *expected_prefix)
{
if (!actual)
{
- fail ("%s: actual: NULL != expected prefix: \"%s\"",
- test, expected_prefix);
+ fail ("%s: %s: actual: NULL != expected prefix: \"%s\"",
+ test, funcname, expected_prefix);
fprintf (stderr, "incorrect value\n");
abort ();
}
if (strncmp (actual, expected_prefix, strlen (expected_prefix)))
{
- fail ("%s: actual: \"%s\" did not begin with expected prefix: \"%s\"",
- test, actual, expected_prefix);
+ fail ("%s: %s: actual: \"%s\" did not begin with expected prefix: \"%s\"",
+ test, funcname, actual, expected_prefix);
fprintf (stderr, "incorrect value\n");
abort ();
}
@@ -177,28 +192,29 @@ check_string_starts_with (const char *actual,
}
void
-check_string_contains (const char *name,
+check_string_contains (const char *funcname,
+ const char *name,
const char *actual,
const char *expected_substring)
{
if (!actual)
{
- fail ("%s: %s: actual: NULL does not contain expected substring: \"%s\"",
- test, name, expected_substring);
+ fail ("%s: %s, %s: actual: NULL does not contain expected substring: \"%s\"",
+ test, funcname, name, expected_substring);
fprintf (stderr, "incorrect value\n");
abort ();
}
if (!strstr (actual, expected_substring))
{
- fail ("%s: %s: actual: \"%s\" did not contain expected substring: \"%s\"",
- test, name, actual, expected_substring);
+ fail ("%s: %s: %s: actual: \"%s\" did not contain expected substring: \"%s\"",
+ test, funcname, name, actual, expected_substring);
fprintf (stderr, "incorrect value\n");
abort ();
}
- pass ("%s: %s: found substring: \"%s\"",
- test, name, expected_substring);
+ pass ("%s: %s: %s: found substring: \"%s\"",
+ test, funcname, name, expected_substring);
}
static void set_options (gcc_jit_context *ctxt, const char *argv0)
--
1.8.5.3
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-01-07 16:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-07 16:06 [PATCH, committed] jit.exp: add __func__ to help test-{combination|threads}.c David Malcolm
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).