From a7e544cd5b754814f792a32197bd9f6250092426 Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Wed, 1 Jul 2026 22:53:14 -0700
Subject: [PATCH 01/13] New API stubs

---
 src/check.h.in | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/check.h.in b/src/check.h.in
index a089cdc6..cfaa7af6 100644
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -225,6 +225,10 @@ CK_DLL_EXP int CK_EXPORT suite_tcase(Suite * s, const char *tcname);
  */
 CK_DLL_EXP void CK_EXPORT suite_add_tcase(Suite * s, TCase * tc);
 
+CK_DLL_EXP const char * CK_EXPORT suite_name(Suite * s);
+CK_DLL_EXP int CK_EXPORT suite_ntcases(Suite * s);
+CK_DLL_EXP TCase ** CK_EXPORT suite_tcases(Suite * s);
+
 /**
  * Create a test case.
  *
@@ -253,6 +257,10 @@ CK_DLL_EXP TCase *CK_EXPORT tcase_create(const char *name);
  * */
 CK_DLL_EXP void CK_EXPORT tcase_set_tags(TCase * tc,
 					 const char *tags);
+
+CK_DLL_EXP int CK_EXPORT tcase_ntags(TCase * tc);
+CK_DLL_EXP const char ** CK_EXPORT tcase_tags(TCase * tc);
+
 /**
  * Add a test function to a test case
  *
@@ -452,6 +460,9 @@ CK_DLL_EXP void CK_EXPORT tcase_fn_start(const char *fname, const char *file,
  */
 CK_DLL_EXP const char* CK_EXPORT tcase_name(void);
 
+CK_DLL_EXP int CK_EXPORT tcase_ntests(TCase * tc);
+CK_DLL_EXP TTest ** CK_EXPORT tcase_tests(TCase * tc);
+
 /**
  * Start a unit test with START_TEST(unit_name), end with END_TEST.
  *
@@ -1972,7 +1983,7 @@ CK_DLL_EXP SRunner *CK_EXPORT srunner_create(Suite * s);
 /**
  * Add an additional suite to a suite runner.
  *
- * The first suite in a suite runner is always added in srunner_create().
+ * An initial suite in a suite runner may be added in srunner_create().
  * This call adds additional suites to a suite runner.
  *
  * @param sr suite runner to add the given suite
@@ -1982,6 +1993,39 @@ CK_DLL_EXP SRunner *CK_EXPORT srunner_create(Suite * s);
  */
 CK_DLL_EXP void CK_EXPORT srunner_add_suite(SRunner * sr, Suite * s);
 
+/**
+ * Get the number of suites in the suite runner.
+ *
+ * A suite runner may have zero or more suites, this call returns
+ * the number of suites currently present in the runner.
+ *
+ * @param sr suite runner to examine
+ *
+ * @return the number of suites currently in the suite runner
+ *
+ * @since 0.15.3
+ */
+CK_DLL_EXP int CK_EXPORT srunner_nsuites(SRunner * sr);
+
+/**
+ * Get an array of suites currently in the suite runner.
+ *
+ * Number of suites is equal to srunner_nsuites().
+ *
+ * Information about individual suites can be queried using:
+ * suite_name(), suite_ntcases(), suite_tcases().
+ *
+ * Memory is malloc'd and must be freed; however, free the entire
+ * structure instead of individual test suites.
+ *
+ * @param sr suite runner to retrieve suites from
+ *
+ * @return array of Suite objects
+ *
+ * @since 0.15.3
+ */
+CK_DLL_EXP Suite ** CK_EXPORT srunner_suites(SRunner * sr);
+
 /**
  * Frees a suite runner, including all contained suite and test cases.
  *

From 4a258c8cefb9d08dca5fa0392276bdf651d1d48c Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Wed, 1 Jul 2026 22:56:57 -0700
Subject: [PATCH 02/13] .editorconfig: Make adjustments to match codebase

Set tab_width to 8, indent_size to 4, and indent_style to space.
---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 63bb9fb9..11c7706c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,9 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
+indent_size = 4
+indent_style = space
+tab_width = 8
 
 [makefile,Makefile]
 indent_style = tab

From c4dab8a7242d1f1f6c0f7135fb54311d94ad9811 Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Wed, 1 Jul 2026 23:01:33 -0700
Subject: [PATCH 03/13] Add check_list_length()

---
 src/check_list.c | 8 ++++++++
 src/check_list.h | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/check_list.c b/src/check_list.c
index d93f51c8..13aad08c 100644
--- a/src/check_list.c
+++ b/src/check_list.c
@@ -152,3 +152,11 @@ int check_list_contains(List * lp, void *val)
 
     return 0;
 }
+
+unsigned int check_list_length(List * lp)
+{
+    if(lp == NULL)
+        return 0;
+
+    return lp->n_elts;
+}
diff --git a/src/check_list.h b/src/check_list.h
index e0b5c8c2..cfb90aaa 100644
--- a/src/check_list.h
+++ b/src/check_list.h
@@ -55,5 +55,7 @@ void check_list_apply(List * lp, void (*fp) (void *));
 /* Return true if the list contains the value, false otherwise */
 int check_list_contains(List * lp, void *val);
 
+/* Return the number of elements in the list */
+unsigned int check_list_length(List * lp);
 
 #endif /* CHECK_LIST_H */

From f9ec3d30ed98db69035ac6093a40bbef5c679970 Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Wed, 1 Jul 2026 23:01:46 -0700
Subject: [PATCH 04/13] Add srunner_{nsuites,suites} APIs

---
 src/check.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/check.c b/src/check.c
index 28ef83ce..db8f1186 100644
--- a/src/check.c
+++ b/src/check.c
@@ -436,6 +436,36 @@ void srunner_add_suite(SRunner * sr, Suite * s)
     check_list_add_end(sr->slst, s);
 }
 
+int srunner_nsuites(SRunner * sr)
+{
+    if(sr == NULL)
+        return 0;
+
+    return check_list_length(sr->slst);
+}
+
+Suite **srunner_suites(SRunner * sr)
+{
+    int i = 0;
+    Suite **sarray;
+    List *slst;
+
+    if (sr == NULL)
+        return NULL;
+
+    sarray = (Suite **)emalloc(sizeof(sarray[0]) * srunner_nsuites(sr));
+
+    slst = sr->slst;
+    for(check_list_front(slst); !check_list_at_end(slst);
+        check_list_advance(slst))
+    {
+        Suite *s = (Suite *)check_list_val(slst);
+        sarray[i++] = s;
+    }
+
+    return sarray;
+}
+
 void srunner_free(SRunner * sr)
 {
     List *l;

From a1ebd90f273bdbb001e04fa2794ce5d8ae5f3959 Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Thu, 2 Jul 2026 21:05:17 -0700
Subject: [PATCH 05/13] Add suite_{name,ntcases,tcases} APIs

---
 src/check.c    | 38 ++++++++++++++++++++++++++++++++++++++
 src/check.h.in | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/src/check.c b/src/check.c
index db8f1186..82aa1cb9 100644
--- a/src/check.c
+++ b/src/check.c
@@ -75,6 +75,43 @@ Suite *suite_create(const char *name)
     return s;
 }
 
+const char *suite_name(Suite * s)
+{
+    if(s == NULL)
+        return NULL;
+
+    return s->name;
+}
+
+int suite_ntcases(Suite * s)
+{
+    if(s == NULL)
+        return 0;
+
+    return check_list_length(s->tclst);
+}
+
+TCase **suite_tcases(Suite * s)
+{
+    int i = 0;
+    TCase **tcarray;
+    List *l;
+
+    if(s == NULL)
+        return NULL;
+
+    tcarray = (TCase **)emalloc(sizeof(tcarray[0]) * suite_ntcases(s));
+
+    l = s->tclst;
+    for(check_list_front(l); !check_list_at_end(l); check_list_advance(l))
+    {
+        TCase *tc = (TCase *)check_list_val(l);
+        tcarray[i++] = tc;
+    }
+
+    return tcarray;
+}
+
 int suite_tcase(Suite * s, const char *tcname)
 {
     List *l;
@@ -250,6 +287,7 @@ void suite_add_tcase(Suite * s, TCase * tc)
     check_list_add_end(s->tclst, tc);
 }
 
+
 void _tcase_add_test(TCase * tc, const TTest * ttest,
                      int _signal, int allowed_exit_value,
                      int start, int end)
diff --git a/src/check.h.in b/src/check.h.in
index cfaa7af6..583edaa9 100644
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -212,6 +212,50 @@ CK_DLL_EXP Suite *CK_EXPORT suite_create(const char *name);
  */
 CK_DLL_EXP int CK_EXPORT suite_tcase(Suite * s, const char *tcname);
 
+/**
+ * Get the name of a suite.
+ *
+ * @param s suite to get the name of
+ *
+ * @return the name of the suite
+ *
+ * @since 0.15.3
+ */
+CK_DLL_EXP const char * CK_EXPORT suite_name(Suite * s);
+
+/**
+ * Get the number of test cases in a suite.
+ *
+ * This call returns the number of test cases currently in the
+ * suite.
+ *
+ * @param s suite to get the number of test cases from
+ *
+ * @return the number of test cases in the suite
+ *
+ * @since 0.15.3
+ */
+CK_DLL_EXP int CK_EXPORT suite_ntcases(Suite * s);
+
+/**
+ * Get the test cases from the suite.
+ *
+ * Number of test cases is equal to srunner_ntcases().
+ *
+ * Information about individual test cases can be queried using:
+ * tcase_name(), tcase_ntags(), tcase_tags().
+ *
+ * Memory is malloc'd and must be freed; however, free the entire
+ * structure instead of individual test cases.
+ *
+ * @param s suite to get the test cases from
+ *
+ * @return array of test case objects
+ *
+ * @since 0.15.3
+ */
+CK_DLL_EXP TCase ** CK_EXPORT suite_tcases(Suite * s);
+
 /**
  * Add a test case to a suite.
  *
@@ -225,10 +269,6 @@ CK_DLL_EXP int CK_EXPORT suite_tcase(Suite * s, const char *tcname);
  */
 CK_DLL_EXP void CK_EXPORT suite_add_tcase(Suite * s, TCase * tc);
 
-CK_DLL_EXP const char * CK_EXPORT suite_name(Suite * s);
-CK_DLL_EXP int CK_EXPORT suite_ntcases(Suite * s);
-CK_DLL_EXP TCase ** CK_EXPORT suite_tcases(Suite * s);
-
 /**
  * Create a test case.
  *

From be5e52eb31a8e6a3745fc1d49416a311156f1cfc Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Thu, 2 Jul 2026 21:18:47 -0700
Subject: [PATCH 06/13] Add tcase_{ntags,tags} APIs

---
 src/check.c    | 29 +++++++++++++++++++++++++++++
 src/check.h.in | 22 ++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/check.c b/src/check.c
index 82aa1cb9..185c4c8a 100644
--- a/src/check.c
+++ b/src/check.c
@@ -236,6 +236,35 @@ void tcase_set_tags(TCase * tc, const char *tags_orig)
     tc->tags = tag_string_to_list(tags_orig);
 }
 
+int tcase_ntags(TCase * tc)
+{
+    if(tc == NULL)
+        return 0;
+
+    return check_list_length(tc->tags);
+}
+
+const char **tcase_tags(TCase * tc)
+{
+    int i = 0;
+    List *l;
+    const char **tarray;
+    
+    if(tc == NULL)
+        return NULL;
+    
+    tarray = emalloc(sizeof(tarray[0]) * tcase_ntags(tc));
+    
+    l = tc->tags;
+    for(check_list_front(l); !check_list_at_end(l); check_list_advance(l))
+    {
+        const char *tag = (const char *)check_list_val(l);
+        tarray[i++] = tag;
+    }
+    
+    return tarray;
+}
+
 static void tcase_free(TCase * tc)
 {
     check_list_apply(tc->tflst, free);
diff --git a/src/check.h.in b/src/check.h.in
index 583edaa9..1352ca61 100644
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -298,7 +298,29 @@ CK_DLL_EXP TCase *CK_EXPORT tcase_create(const char *name);
 CK_DLL_EXP void CK_EXPORT tcase_set_tags(TCase * tc,
 					 const char *tags);
 
+/**
+ * Get the number of tags associated with a test case.
+ *
+ * @param tc the test case
+ *
+ * @return the number of tags associated with the test case
+ *
+ * @since 0.15.3
+ */
 CK_DLL_EXP int CK_EXPORT tcase_ntags(TCase * tc);
+
+/**
+ * Get the tags associated with the test case.
+ *
+ * Memory is malloc'd and must be freed; however, free the entire
+ * structure instead of individual tags.
+ *
+ * @param tc the test case
+ *
+ * @return the array of string tags associated with the test case
+ *
+ * @since 0.15.3
+ */
 CK_DLL_EXP const char ** CK_EXPORT tcase_tags(TCase * tc);
 
 /**

From c259dc06577772c88cbdc8d2ed15f1d50716b1df Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Thu, 2 Jul 2026 21:35:59 -0700
Subject: [PATCH 07/13] Change tcase_name() API to take a TCase

For consistency with other API, `tcase_name()` now takes a TCase and returns
its name, rather than returning the name of the currently-running TCase. The
currently-running TCase is exposed by a new API, `tcase_current()`.

This also required changing the `tcase_fn_start()` internal function to take
the currently-running TCase, so I also took the opportunity to rename it to
`_tcase_fn_start()` so that it's clearly an exposed internal function.
---
 src/check.c             |  20 +-
 src/check.h.in          |  27 ++-
 src/check_run.c         |   6 +-
 tests/check_check_sub.c | 406 ++++++++++++++++++++--------------------
 4 files changed, 240 insertions(+), 219 deletions(-)

diff --git a/src/check.c b/src/check.c
index 185c4c8a..5daad643 100644
--- a/src/check.c
+++ b/src/check.c
@@ -52,7 +52,7 @@ int check_major_version = CHECK_MAJOR_VERSION;
 int check_minor_version = CHECK_MINOR_VERSION;
 int check_micro_version = CHECK_MICRO_VERSION;
 
-const char* current_test_name = NULL;
+static TCase *current_test_case = NULL;
 
 static int non_pass(enum test_result);
 static Fixture *fixture_create(SFun fun, int ischecked);
@@ -410,18 +410,26 @@ void tcase_set_timeout(TCase * tc, double timeout)
 #endif /* HAVE_FORK */
 }
 
-void tcase_fn_start(const char *fname, const char *file,
-                    int line)
+void _tcase_fn_start(TCase * tc, const char *fname,
+                     const char *file, int line)
 {
     send_ctx_info(CK_CTX_TEST);
     send_loc_info(file, line);
 
-    current_test_name = fname;
+    current_test_case = tc;
 }
 
-const char* tcase_name(void)
+TCase *tcase_current(void)
 {
-    return current_test_name;
+    return current_test_case;
+}
+
+const char *tcase_name(TCase * tc)
+{
+    if(tc == NULL)
+        return NULL;
+
+    return tc->name;
 }
 
 void _mark_point(const char *file, int line)
diff --git a/src/check.h.in b/src/check.h.in
index 1352ca61..7f041e5c 100644
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -509,18 +509,29 @@ CK_DLL_EXP void CK_EXPORT tcase_add_checked_fixture(TCase * tc, SFun setup,
 CK_DLL_EXP void CK_EXPORT tcase_set_timeout(TCase * tc, double timeout);
 
 /* Internal function to mark the start of a test function */
-CK_DLL_EXP void CK_EXPORT tcase_fn_start(const char *fname, const char *file,
-                                         int line);
+CK_DLL_EXP void CK_EXPORT _tcase_fn_start(TCase * tc, const char *fname,
+                                          const char *file, int line);
 
 /**
- * Retreive the name of the current running test. This is the name
- * of the test passed to START_TEST. This is only valid when called
- * from a running test. The value return outside of a running test is
- * undefined.
+ * Retrieve the current running test case.
  *
- * @since 0.11.0
+ * This is only valid when called from a running test. The value
+ * returned outside of a running test is undefined.
+ *
+ * @since 0.15.3
+ */
+CK_DLL_EXP TCase * CK_EXPORT tcase_current(void);
+
+/**
+ * Retreive the name of a test case.
+ *
+ * @param tc test case to get the name of
+ *
+ * @return the name of the test case
+ *
+ * @since 0.15.3
  */
-CK_DLL_EXP const char* CK_EXPORT tcase_name(void);
+CK_DLL_EXP const char * CK_EXPORT tcase_name(TCase * tc);
 
 CK_DLL_EXP int CK_EXPORT tcase_ntests(TCase * tc);
 CK_DLL_EXP TTest ** CK_EXPORT tcase_tests(TCase * tc);
diff --git a/src/check_run.c b/src/check_run.c
index 5f160e50..6340f4e8 100644
--- a/src/check_run.c
+++ b/src/check_run.c
@@ -416,7 +416,8 @@ static TestResult *tcase_run_tfun_nofork(SRunner * sr, TCase * tc, TF * tfun,
         clock_gettime(check_get_clockid(), &ts_start);
         if(0 == setjmp(error_jmp_buffer))
         {
-            tcase_fn_start(tfun->ttest->name, tfun->ttest->file, tfun->ttest->line);
+            _tcase_fn_start(tc, tfun->ttest->name, tfun->ttest->file,
+                            tfun->ttest->line);
             tfun->ttest->fn(i);
         }
         clock_gettime(check_get_clockid(), &ts_end);
@@ -493,7 +494,8 @@ static TestResult *tcase_run_tfun_fork(SRunner * sr, TCase * tc, TF * tfun,
         tr = tcase_run_checked_setup(sr, tc);
         free(tr);
         clock_gettime(check_get_clockid(), &ts_start);
-        tcase_fn_start(tfun->ttest->name, tfun->ttest->file, tfun->ttest->line);
+        _tcase_fn_start(tc, tfun->ttest->name, tfun->ttest->file,
+                        tfun->ttest->line);
         tfun->ttest->fn(i);
         clock_gettime(check_get_clockid(), &ts_end);
         tcase_run_checked_teardown(tc);
diff --git a/tests/check_check_sub.c b/tests/check_check_sub.c
index b581d5c7..2a1b5deb 100644
--- a/tests/check_check_sub.c
+++ b/tests/check_check_sub.c
@@ -29,7 +29,7 @@
 
 START_TEST(test_lno)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_abort_msg("Failure expected");
@@ -39,7 +39,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK==1
 START_TEST(test_mark_lno)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   mark_point();
@@ -50,7 +50,7 @@ END_TEST
 
 START_TEST(test_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_msg(1 == 1, "This test should pass");
   ck_assert_msg(9999, "This test should pass");
@@ -59,7 +59,7 @@ END_TEST
 
 START_TEST(test_fail_unless)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   fail_unless(1 == 2, "This test should fail");
@@ -68,7 +68,7 @@ END_TEST
 
 START_TEST(test_fail_if_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   fail_if(1 == 2, "This test should pass");
   fail_if(0, "This test should pass");
@@ -77,7 +77,7 @@ END_TEST
 
 START_TEST(test_fail_if_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   fail_if(1 == 1, "This test should fail");
@@ -86,7 +86,7 @@ END_TEST
 
 START_TEST(test_fail_null_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   fail_unless(2 == 3, NULL);
@@ -96,7 +96,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_no_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   /* taking out the NULL provokes an ISO C99 warning in GCC */
   record_failure_line_num(__LINE__);
@@ -106,7 +106,7 @@ END_TEST
 #endif /* __GNUC__ */
 START_TEST(test_fail_if_null_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   fail_if(2 != 3, NULL);
@@ -116,7 +116,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_if_no_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   /* taking out the NULL provokes an ISO C99 warning in GCC */
   record_failure_line_num(__LINE__);
@@ -129,7 +129,7 @@ START_TEST(test_fail_vararg_msg_1)
   int x = 3;
   int y = 4;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   fail_unless(x == y, "%d != %d", x, y);
@@ -141,7 +141,7 @@ START_TEST(test_fail_vararg_msg_2)
   int x = 5;
   int y = 6;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   fail_if(x != y, "%d != %d", x, y);
@@ -153,7 +153,7 @@ START_TEST(test_fail_vararg_msg_3)
   int x = 7;
   int y = 7;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   fail("%d == %d", x, y);
@@ -163,7 +163,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_empty)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   /* plain fail() doesn't compile with xlc in C mode because of `, ## __VA_ARGS__' problem */
   /* on the other hand, taking out the NULL provokes an ISO C99 warning in GCC */
@@ -175,7 +175,7 @@ END_TEST
 
 START_TEST(test_ck_abort)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_abort();
@@ -184,7 +184,7 @@ END_TEST
 
 START_TEST(test_ck_abort_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_abort_msg("Failure expected");
@@ -194,7 +194,7 @@ END_TEST
 /* FIXME: perhaps passing NULL to ck_abort_msg should be an error. */
 START_TEST(test_ck_abort_msg_null)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_abort_msg(NULL);
@@ -209,7 +209,7 @@ START_TEST(test_ck_assert)
   int x = 3;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert(1);
   ck_assert(x == y);
@@ -222,7 +222,7 @@ END_TEST
 
 START_TEST(test_ck_assert_null)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert(0);
@@ -233,7 +233,7 @@ START_TEST(test_ck_assert_with_mod)
 {
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert(1%f == 1);
@@ -245,7 +245,7 @@ START_TEST(test_ck_assert_int_eq)
   int x = 3;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_int_eq(x, y);
   y++;
@@ -259,7 +259,7 @@ START_TEST(test_ck_assert_int_eq_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_int_eq(3%d, 2%f);
@@ -271,7 +271,7 @@ START_TEST(test_ck_assert_int_ne)
   int x = 3;
   int y = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_int_ne(x, y);
   y++;
@@ -285,7 +285,7 @@ START_TEST(test_ck_assert_int_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_int_ne(3%d, 3%f);
@@ -297,7 +297,7 @@ START_TEST(test_ck_assert_int_lt)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_int_lt(x, y);
   record_failure_line_num(__LINE__);
@@ -310,7 +310,7 @@ START_TEST(test_ck_assert_int_lt_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_int_lt(3%d, 3%f);
@@ -322,7 +322,7 @@ START_TEST(test_ck_assert_int_le)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_int_le(x, y);
   ck_assert_int_le(x, x);
@@ -336,7 +336,7 @@ START_TEST(test_ck_assert_int_le_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_int_le(3%d, 2%f);
@@ -348,7 +348,7 @@ START_TEST(test_ck_assert_int_gt)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_int_gt(y, x);
   record_failure_line_num(__LINE__);
@@ -361,7 +361,7 @@ START_TEST(test_ck_assert_int_gt_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_int_gt(3%d, 3%f);
@@ -373,7 +373,7 @@ START_TEST(test_ck_assert_int_ge)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_int_ge(y, x);
   ck_assert_int_ge(y, x);
@@ -387,7 +387,7 @@ START_TEST(test_ck_assert_int_ge_with_mod)
   int d = 1;
   int f = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_int_ge(3%d, 4%f);
@@ -399,7 +399,7 @@ START_TEST(test_ck_assert_int_expr)
   int x = 1;
   int y = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_int_eq(x, ++y);
   ck_assert_int_eq(x, y);
@@ -410,7 +410,7 @@ START_TEST(test_ck_assert_uint_eq)
   unsigned int x = 3;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_uint_eq(x, y);
   y++;
@@ -424,7 +424,7 @@ START_TEST(test_ck_assert_uint_eq_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_eq(3%d, 1%f);
@@ -436,7 +436,7 @@ START_TEST(test_ck_assert_uint_ne)
   unsigned int x = 3;
   unsigned int y = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_uint_ne(x, y);
   y++;
@@ -450,7 +450,7 @@ START_TEST(test_ck_assert_uint_ne_with_mod)
   int d = 1;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_ne(1%d, 1%f);
@@ -462,7 +462,7 @@ START_TEST(test_ck_assert_uint_lt)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_uint_lt(x, y);
   record_failure_line_num(__LINE__);
@@ -475,7 +475,7 @@ START_TEST(test_ck_assert_uint_lt_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_lt(3%d, 1%f);
@@ -487,7 +487,7 @@ START_TEST(test_ck_assert_uint_le)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_uint_le(x, y);
   ck_assert_uint_le(x, x);
@@ -501,7 +501,7 @@ START_TEST(test_ck_assert_uint_le_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_le(3%d, 1%f);
@@ -513,7 +513,7 @@ START_TEST(test_ck_assert_uint_gt)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_uint_gt(y, x);
   record_failure_line_num(__LINE__);
@@ -526,7 +526,7 @@ START_TEST(test_ck_assert_uint_gt_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_gt(1%d, 3%f);
@@ -538,7 +538,7 @@ START_TEST(test_ck_assert_uint_ge)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_uint_ge(y, x);
   ck_assert_uint_ge(y, x);
@@ -552,7 +552,7 @@ START_TEST(test_ck_assert_uint_ge_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_ge(1%d, 3%f);
@@ -564,7 +564,7 @@ START_TEST(test_ck_assert_uint_expr)
   unsigned int x = 1;
   unsigned int y = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_uint_eq(x, ++y);
   ck_assert_uint_eq(x, y);
@@ -575,7 +575,7 @@ START_TEST(test_ck_assert_float_eq)
   float x = 1.1f;
   float y = 1.1f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_eq(x, y);
   y+=0.1f;
@@ -589,7 +589,7 @@ START_TEST(test_ck_assert_float_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_eq(3%d, 2%f);
@@ -601,7 +601,7 @@ START_TEST(test_ck_assert_float_ne)
   float x = 1.1f;
   float y = 1.2f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_ne(x, y);
   y = x;
@@ -615,7 +615,7 @@ START_TEST(test_ck_assert_float_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ne(1%d, 1%f);
@@ -627,7 +627,7 @@ START_TEST(test_ck_assert_float_lt)
   float x = 2.0f;
   float y = 2.5f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_lt(x, y);
   y-=1.0f;
@@ -641,7 +641,7 @@ START_TEST(test_ck_assert_float_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_lt(3%d, 2%f);
@@ -653,7 +653,7 @@ START_TEST(test_ck_assert_float_le)
   float x = 2.0f;
   float y = 2.5f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_le(x, y);
   ck_assert_float_le(x, x);
@@ -668,7 +668,7 @@ START_TEST(test_ck_assert_float_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_le(3%d, 2%f);
@@ -680,7 +680,7 @@ START_TEST(test_ck_assert_float_gt)
   float x = 2.5f;
   float y = 2.0f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_gt(x, y);
   y+=1.0f;
@@ -694,7 +694,7 @@ START_TEST(test_ck_assert_float_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_gt(2%d, 3%f);
@@ -706,7 +706,7 @@ START_TEST(test_ck_assert_float_ge)
   float x = 2.5f;
   float y = 2.0f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_ge(x, y);
   ck_assert_float_ge(x, x);
@@ -721,7 +721,7 @@ START_TEST(test_ck_assert_float_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ge(2%d, 3%f);
@@ -734,7 +734,7 @@ START_TEST(test_ck_assert_float_with_expr)
   float y = 1.1f;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   i = 1;
   ck_assert_float_eq(x[i++], y);
@@ -770,7 +770,7 @@ START_TEST(test_ck_assert_float_eq_tol)
   float y = 0.0003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_eq_tol(x, y, t);
   ck_assert_float_eq_tol(x, x, t);
@@ -790,7 +790,7 @@ START_TEST(test_ck_assert_float_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_eq_tol(3%d, 2%f, 2%p);
@@ -803,7 +803,7 @@ START_TEST(test_ck_assert_float_ne_tol)
   float y = 0.0002f;
   float t = 0.0001f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_ne_tol(x, y, t);
   x*=10.0f;
@@ -822,7 +822,7 @@ START_TEST(test_ck_assert_float_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ne_tol(3%d, 3%f, 3%p);
@@ -835,7 +835,7 @@ START_TEST(test_ck_assert_float_ge_tol)
   float y = 0.003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_ge_tol(y, x, t);
   ck_assert_float_ge_tol(x, x, t);
@@ -857,7 +857,7 @@ START_TEST(test_ck_assert_float_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ge_tol(2%d, 3%f, 3%p);
@@ -870,7 +870,7 @@ START_TEST(test_ck_assert_float_le_tol)
   float y = 0.003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_le_tol(x, y, t);
   ck_assert_float_le_tol(x, x, t);
@@ -892,7 +892,7 @@ START_TEST(test_ck_assert_float_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_le_tol(3%d, 2%f, 3%p);
@@ -906,7 +906,7 @@ START_TEST(test_ck_assert_float_tol_with_expr)
   float t = 0.01f;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   i = 1;
   ck_assert_float_eq_tol(x[i++], y, t);
@@ -933,7 +933,7 @@ START_TEST(test_ck_assert_float_finite)
   float x = 0.0001f;
   float t = 1.0f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -949,7 +949,7 @@ START_TEST(test_ck_assert_float_finite_with_mod)
   float t = 1.0f;
   float x = 1.0f / (1.0f - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_finite(x*(1%d));
@@ -961,7 +961,7 @@ START_TEST(test_ck_assert_float_infinite)
   float t = 1.0f;
   float x = 1.0f / (1.0f - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_infinite(x);
   x = -1.0f / (1.0f - t);
@@ -976,7 +976,7 @@ START_TEST(test_ck_assert_float_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_infinite(2%d);
@@ -988,7 +988,7 @@ START_TEST(test_ck_assert_float_nan)
   float t = 1.0f;
   float x = 0.0f / (1.0f - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_nan(x);
   x = 1.0f / (1.0f - t);
@@ -1001,7 +1001,7 @@ START_TEST(test_ck_assert_float_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_float_nan(2%d);
@@ -1013,7 +1013,7 @@ START_TEST(test_ck_assert_float_nonnan)
   float x = 0.0f;
   float t = 1.0f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_nonnan(x);
 #if ENABLE_REGEX
@@ -1032,7 +1032,7 @@ START_TEST(test_ck_assert_float_nonnan_with_mod)
   float t = 1.0f;
   float x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_nonnan(2%s);
 #if ENABLE_REGEX
@@ -1051,7 +1051,7 @@ START_TEST(test_ck_assert_float_nan_and_inf_with_expr)
   float x[] = {0.0f, 0.0f, INFINITY, INFINITY, NAN, NAN, 0.0f, 0.0f, NAN};
   int i = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_float_finite(x[i++]);
   ck_assert_float_finite(x[i++]);
@@ -1069,7 +1069,7 @@ START_TEST(test_ck_assert_double_eq)
   double x = 1.1;
   double y = 1.1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_eq(x, y);
   y+=0.1;
@@ -1083,7 +1083,7 @@ START_TEST(test_ck_assert_double_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq(3%d, 2%f);
@@ -1095,7 +1095,7 @@ START_TEST(test_ck_assert_double_eq_with_promotion)
   float x = 0.1F;
   double y = x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_eq(x, y);
 }
@@ -1105,7 +1105,7 @@ START_TEST(test_ck_assert_double_eq_with_conv)
 {
   float x = 0.1F;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq(x, 0.1);
@@ -1117,7 +1117,7 @@ START_TEST(test_ck_assert_double_ne)
   double x = 1.1;
   double y = 1.2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_ne(x, y);
   y = x;
@@ -1131,7 +1131,7 @@ START_TEST(test_ck_assert_double_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ne(1%d, 1%f);
@@ -1143,7 +1143,7 @@ START_TEST(test_ck_assert_double_lt)
   double x = 2.0;
   double y = 2.5;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_lt(x, y);
   y-=1;
@@ -1157,7 +1157,7 @@ START_TEST(test_ck_assert_double_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_lt(3%d, 2%f);
@@ -1169,7 +1169,7 @@ START_TEST(test_ck_assert_double_le)
   double x = 2.0;
   double y = 2.5;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_le(x, y);
   ck_assert_double_le(x, x);
@@ -1184,7 +1184,7 @@ START_TEST(test_ck_assert_double_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_le(3%d, 2%f);
@@ -1196,7 +1196,7 @@ START_TEST(test_ck_assert_double_gt)
   double x = 2.5;
   double y = 2.0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_gt(x, y);
   y+=1;
@@ -1210,7 +1210,7 @@ START_TEST(test_ck_assert_double_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_gt(2%d, 3%f);
@@ -1222,7 +1222,7 @@ START_TEST(test_ck_assert_double_ge)
   double x = 2.5;
   double y = 2.0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_ge(x, y);
   ck_assert_double_ge(x, x);
@@ -1237,7 +1237,7 @@ START_TEST(test_ck_assert_double_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ge(2%d, 3%f);
@@ -1250,7 +1250,7 @@ START_TEST(test_ck_assert_double_with_expr)
   double y = 1.1;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   i = 1;
   ck_assert_double_eq(x[i++], y);
@@ -1286,7 +1286,7 @@ START_TEST(test_ck_assert_double_eq_tol)
   double y = 0.0002;
   double t = 0.001;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_eq_tol(x, y, t);
   ck_assert_double_eq_tol(x, x, t);
@@ -1306,7 +1306,7 @@ START_TEST(test_ck_assert_double_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq_tol(3%d, 2%f, 2%p);
@@ -1319,7 +1319,7 @@ START_TEST(test_ck_assert_double_ne_tol)
   double y = 0.0002;
   double t = 0.0001;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_ne_tol(x, y, t);
   x*=10;
@@ -1338,7 +1338,7 @@ START_TEST(test_ck_assert_double_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ne_tol(3%d, 3%f, 3%p);
@@ -1351,7 +1351,7 @@ START_TEST(test_ck_assert_double_ge_tol)
   double y = 0.003;
   double t = 0.001;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_ge_tol(y, x, t);
   ck_assert_double_ge_tol(x, x, t);
@@ -1373,7 +1373,7 @@ START_TEST(test_ck_assert_double_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ge_tol(2%d, 3%f, 3%p);
@@ -1386,7 +1386,7 @@ START_TEST(test_ck_assert_double_le_tol)
   double y = 0.003;
   double t = 0.001;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_le_tol(x, y, t);
   ck_assert_double_le_tol(x, x, t);
@@ -1408,7 +1408,7 @@ START_TEST(test_ck_assert_double_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_le_tol(3%d, 2%f, 3%p);
@@ -1422,7 +1422,7 @@ START_TEST(test_ck_assert_double_tol_with_expr)
   double t = 0.01;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   i = 1;
   ck_assert_double_eq_tol(x[i++], y, t);
@@ -1449,7 +1449,7 @@ START_TEST(test_ck_assert_double_finite)
   double x = 0.0001;
   double t = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -1465,7 +1465,7 @@ START_TEST(test_ck_assert_double_finite_with_mod)
   double t = 1;
   double x = 1.0 / (1.0 - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_finite(x*(1%d));
@@ -1477,7 +1477,7 @@ START_TEST(test_ck_assert_double_infinite)
   double t = 1;
   double x = 1.0 / (1.0 - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_infinite(x);
   x = -1.0 / (1.0 - t);
@@ -1492,7 +1492,7 @@ START_TEST(test_ck_assert_double_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_infinite(2%d);
@@ -1504,7 +1504,7 @@ START_TEST(test_ck_assert_double_nan)
   double t = 1;
   double x = 0.0 / (1.0 - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_nan(x);
   x = 1.0 / (1.0 - t);
@@ -1517,7 +1517,7 @@ START_TEST(test_ck_assert_double_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_double_nan(2%d);
@@ -1529,7 +1529,7 @@ START_TEST(test_ck_assert_double_nonnan)
   double x = 0;
   double t = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_nonnan(x);
 #if ENABLE_REGEX
@@ -1548,7 +1548,7 @@ START_TEST(test_ck_assert_double_nonnan_with_mod)
   double t = 1.0;
   double x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_nonnan(2%s);
 #if ENABLE_REGEX
@@ -1567,7 +1567,7 @@ START_TEST(test_ck_assert_double_nan_and_inf_with_expr)
   double x[] = {0.0, 0.0, INFINITY, INFINITY, NAN, NAN, 0.0, 0.0, NAN};
   int i = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_double_finite(x[i++]);
   ck_assert_double_finite(x[i++]);
@@ -1585,7 +1585,7 @@ START_TEST(test_ck_assert_ldouble_eq)
   long double x = 1.1l;
   long double y = 1.1l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_eq(x, y);
   y+=0.1l;
@@ -1599,7 +1599,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_eq(3%d, 2%f);
@@ -1611,7 +1611,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_promotion)
   float x = 1.1F;
   long double y = x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_eq(x, y);
 }
@@ -1622,7 +1622,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_conv)
   float x = 1.1F;
   long double y = x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_eq(x, y);
   record_failure_line_num(__LINE__);
@@ -1635,7 +1635,7 @@ START_TEST(test_ck_assert_ldouble_ne)
   long double x = 1.1l;
   long double y = 1.2l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_ne(x, y);
   y = x;
@@ -1649,7 +1649,7 @@ START_TEST(test_ck_assert_ldouble_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ne(1%d, 1%f);
@@ -1661,7 +1661,7 @@ START_TEST(test_ck_assert_ldouble_lt)
   long double x = 2.0l;
   long double y = 2.5l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_lt(x, y);
   y-=1.0l;
@@ -1675,7 +1675,7 @@ START_TEST(test_ck_assert_ldouble_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_lt(3%d, 2%f);
@@ -1687,7 +1687,7 @@ START_TEST(test_ck_assert_ldouble_le)
   long double x = 2.0l;
   long double y = 2.5l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_le(x, y);
   ck_assert_ldouble_le(x, x);
@@ -1702,7 +1702,7 @@ START_TEST(test_ck_assert_ldouble_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_le(3%d, 2%f);
@@ -1714,7 +1714,7 @@ START_TEST(test_ck_assert_ldouble_gt)
   long double x = 2.5l;
   long double y = 2.0l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_gt(x, y);
   y+=1.0l;
@@ -1728,7 +1728,7 @@ START_TEST(test_ck_assert_ldouble_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_gt(2%d, 3%f);
@@ -1740,7 +1740,7 @@ START_TEST(test_ck_assert_ldouble_ge)
   long double x = 2.5l;
   long double y = 2.0l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_ge(x, y);
   ck_assert_ldouble_ge(x, x);
@@ -1755,7 +1755,7 @@ START_TEST(test_ck_assert_ldouble_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ge(2%d, 3%f);
@@ -1768,7 +1768,7 @@ START_TEST(test_ck_assert_ldouble_with_expr)
   long double y = 1.1l;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   i = 1;
   ck_assert_ldouble_eq(x[i++], y);
@@ -1804,7 +1804,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol)
   long double y = 0.0002l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_eq_tol(x, y, t);
   ck_assert_ldouble_eq_tol(x, x, t);
@@ -1824,7 +1824,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_eq_tol(3%d, 2%f, 2%p);
@@ -1837,7 +1837,7 @@ START_TEST(test_ck_assert_ldouble_ne_tol)
   long double y = 0.0002l;
   long double t = 0.0001l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_ne_tol(x, y, t);
   x*=10.0l;
@@ -1856,7 +1856,7 @@ START_TEST(test_ck_assert_ldouble_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ne_tol(3%d, 3%f, 3%p);
@@ -1869,7 +1869,7 @@ START_TEST(test_ck_assert_ldouble_ge_tol)
   long double y = 0.003l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_ge_tol(y, x, t);
   ck_assert_ldouble_ge_tol(x, x, t);
@@ -1891,7 +1891,7 @@ START_TEST(test_ck_assert_ldouble_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ge_tol(2%d, 3%f, 3%p);
@@ -1904,7 +1904,7 @@ START_TEST(test_ck_assert_ldouble_le_tol)
   long double y = 0.003l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_le_tol(x, y, t);
   ck_assert_ldouble_le_tol(x, x, t);
@@ -1926,7 +1926,7 @@ START_TEST(test_ck_assert_ldouble_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_le_tol(3%d, 2%f, 3%p);
@@ -1940,7 +1940,7 @@ START_TEST(test_ck_assert_ldouble_tol_with_expr)
   long double t = 0.01l;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   i = 1;
   ck_assert_ldouble_eq_tol(x[i++], y, t);
@@ -1967,7 +1967,7 @@ START_TEST(test_ck_assert_ldouble_finite)
   long double x = 0.0001l;
   long double t = 1.0l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -1983,7 +1983,7 @@ START_TEST(test_ck_assert_ldouble_finite_with_mod)
   long double t = 1.0l;
   long double x = 1.0l / (1.0l - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_finite(x*(1%d));
@@ -1995,7 +1995,7 @@ START_TEST(test_ck_assert_ldouble_infinite)
   long double t = 1.0l;
   long double x = 1.0l / (1.0l - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_infinite(x);
   x = -1.0l / (1.0l - t);
@@ -2010,7 +2010,7 @@ START_TEST(test_ck_assert_ldouble_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_infinite(2%d);
@@ -2022,7 +2022,7 @@ START_TEST(test_ck_assert_ldouble_nan)
   long double t = 1.0l;
   long double x = 0.0l / (1.0l - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_nan(x);
   x = 1.0l / (1.0l - t);
@@ -2035,7 +2035,7 @@ START_TEST(test_ck_assert_ldouble_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_nan(2%d);
@@ -2047,7 +2047,7 @@ START_TEST(test_ck_assert_ldouble_nonnan)
   long double x = 0.0l;
   long double t = 1.0l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_nonnan(x);
 #if ENABLE_REGEX
@@ -2066,7 +2066,7 @@ START_TEST(test_ck_assert_ldouble_nonnan_with_mod)
   long double t = 1.0l;
   long double x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_nonnan(2%s);
 #if ENABLE_REGEX
@@ -2085,7 +2085,7 @@ START_TEST(test_ck_assert_ldouble_nan_and_inf_with_expr)
   long double x[] = {0.0l, 0.0l, INFINITY, INFINITY, NAN, NAN, 0.0l, 0.0l, NAN};
   int i = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ldouble_finite(x[i++]);
   ck_assert_ldouble_finite(x[i++]);
@@ -2107,7 +2107,7 @@ int returnsZero(const char* argument)
 
 START_TEST(test_percent_n_escaped)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   /* If the %n is not escaped in the ck macro, then this results in a SEGFAULT */
   record_failure_line_num(__LINE__);
@@ -2118,7 +2118,7 @@ START_TEST(test_ck_assert_str_eq)
 {
   const char *s = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_str_eq("test2", s);
   record_failure_line_num(__LINE__);
@@ -2131,7 +2131,7 @@ START_TEST(test_ck_assert_str_eq_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_str_eq(t, s);
@@ -2143,7 +2143,7 @@ START_TEST(test_ck_assert_str_ne)
   const char *s = "test2";
   const char *t = "test1";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_str_ne(t, s);
   t = "test2";
@@ -2157,7 +2157,7 @@ START_TEST(test_ck_assert_str_ne_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_str_ne(t, s);
@@ -2169,7 +2169,7 @@ START_TEST(test_ck_assert_str_lt)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_str_lt(s, t);
   record_failure_line_num(__LINE__);
@@ -2182,7 +2182,7 @@ START_TEST(test_ck_assert_str_lt_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_str_lt(s, t);
@@ -2194,7 +2194,7 @@ START_TEST(test_ck_assert_str_le)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_str_le(s, t);
   ck_assert_str_le(s, s);
@@ -2208,7 +2208,7 @@ START_TEST(test_ck_assert_str_le_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_str_le(t, s);
@@ -2220,7 +2220,7 @@ START_TEST(test_ck_assert_str_gt)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_str_gt(t, s);
   record_failure_line_num(__LINE__);
@@ -2233,7 +2233,7 @@ START_TEST(test_ck_assert_str_gt_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_str_gt(t, s);
@@ -2245,7 +2245,7 @@ START_TEST(test_ck_assert_str_ge)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_str_ge(t, s);
   ck_assert_str_ge(t, t);
@@ -2259,7 +2259,7 @@ START_TEST(test_ck_assert_str_ge_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_str_ge(s, t);
@@ -2272,7 +2272,7 @@ START_TEST(test_ck_assert_str_expr)
   const char *t[] = { "test1", "test2" };
   int i = -1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_str_eq(s, t[++i]);
   ck_assert_str_eq(s, t[i]);
@@ -2283,7 +2283,7 @@ START_TEST(test_ck_assert_pstr_eq)
 {
   const char *s = "test";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_pstr_eq("test", s);
   ck_assert_pstr_eq(NULL, NULL);
@@ -2297,7 +2297,7 @@ START_TEST(test_ck_assert_pstr_eq_with_null)
   const char *t = "test";
   const char *s = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_pstr_eq(t, s);
@@ -2309,7 +2309,7 @@ START_TEST(test_ck_assert_pstr_ne)
   const char *t = "test1";
   const char *s = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_pstr_ne(t, s);
   ck_assert_pstr_ne(t, NULL);
@@ -2324,7 +2324,7 @@ START_TEST(test_ck_assert_pstr_ne_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_pstr_ne(t, s);
@@ -2336,7 +2336,7 @@ START_TEST(test_ck_assert_ptr_eq)
   int * x = (int*)0x1;
   int * y = (int*)0x2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ptr_eq(NULL, NULL);
   ck_assert_ptr_eq(x,    x);
@@ -2351,7 +2351,7 @@ START_TEST(test_ck_assert_ptr_ne)
   int * y = (int*)0x2;
   int * z = x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ptr_ne(x,    y);
   ck_assert_ptr_ne(x,    NULL);
@@ -2366,7 +2366,7 @@ START_TEST(test_ck_assert_ptr_null)
   void* x = (void*)0x1;
   void* y = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ptr_null(y);
   record_failure_line_num(__LINE__);
@@ -2379,7 +2379,7 @@ START_TEST(test_ck_assert_ptr_nonnull)
   void* x = NULL;
   void* y = (void*)0x1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_ptr_nonnull(y);
   record_failure_line_num(__LINE__);
@@ -2391,7 +2391,7 @@ START_TEST(test_ck_assert_mem_eq)
 {
   const char *s = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_mem_eq("\x00\x00\x00\x00\x02", s, 5);
   record_failure_line_num(__LINE__);
@@ -2404,7 +2404,7 @@ START_TEST(test_ck_assert_mem_ne)
   const char *s = "\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_mem_ne(t, s, 5);
   t = "\x00\x00\x00\x00\x02";
@@ -2418,7 +2418,7 @@ START_TEST(test_ck_assert_mem_lt)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_mem_lt(s, t, 5);
   record_failure_line_num(__LINE__);
@@ -2431,7 +2431,7 @@ START_TEST(test_ck_assert_mem_le)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_mem_le(s, t, 5);
   ck_assert_mem_le(s, s, 5);
@@ -2445,7 +2445,7 @@ START_TEST(test_ck_assert_mem_gt)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_mem_gt(t, s, 5);
   record_failure_line_num(__LINE__);
@@ -2458,7 +2458,7 @@ START_TEST(test_ck_assert_mem_ge)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_mem_ge(t, s, 5);
   ck_assert_mem_ge(t, t, 5);
@@ -2472,7 +2472,7 @@ START_TEST(test_ck_assert_mem_zerolen)
   const char *s = "\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   ck_assert_mem_eq(t, s, 0);
 }
@@ -2483,7 +2483,7 @@ START_TEST(test_ck_assert_mem_eq_exact)
   const char *s = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_mem_eq(t, s, 64);
@@ -2495,7 +2495,7 @@ START_TEST(test_ck_assert_mem_eq_longer)
   const char *s = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   record_failure_line_num(__LINE__);
   ck_assert_mem_eq(t, s, 65);
@@ -2505,7 +2505,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK == 1
 START_TEST(test_segv_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   /*
    * This test is to be used when it would otherwise not cause a
    * failure. e.g., shen SIGSEGV is expected.
@@ -2516,7 +2516,7 @@ END_TEST
 
 START_TEST(test_segv)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   raise (SIGSEGV);
 }
@@ -2529,7 +2529,7 @@ END_TEST
 #if !defined(__CYGWIN__)
 START_TEST(test_fpe)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   raise (SIGFPE);
 }
@@ -2542,7 +2542,7 @@ END_TEST
  */
 START_TEST(test_non_signal_8)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   exit(0);
 }
@@ -2559,7 +2559,7 @@ END_TEST
 START_TEST(test_mark_point)
 {
   int i;
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   i = 0;
   i++;
   mark_point();
@@ -2575,7 +2575,7 @@ END_TEST
 #if TIMEOUT_TESTS_ENABLED && defined(HAVE_FORK) && HAVE_FORK == 1
 START_TEST(test_eternal_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   for (;;)
     sleep(1);
@@ -2589,21 +2589,21 @@ END_TEST
 #ifdef HAVE_LIBRT
 START_TEST(test_sleep0_025_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   usleep(25*1000);
 }
 END_TEST
 
 START_TEST(test_sleep1_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   sleep(1);
 }
 END_TEST
 
 START_TEST(test_sleep1_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(1);
 }
@@ -2612,14 +2612,14 @@ END_TEST
 
 START_TEST(test_sleep2_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   sleep(2);
 }
 END_TEST
 
 START_TEST(test_sleep2_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(2);
 }
@@ -2627,14 +2627,14 @@ END_TEST
 
 START_TEST(test_sleep5_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   sleep(5);
 }
 END_TEST
 
 START_TEST(test_sleep5_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(5);
 }
@@ -2642,14 +2642,14 @@ END_TEST
 
 START_TEST(test_sleep9_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   sleep(9);
 }
 END_TEST
 
 START_TEST(test_sleep9_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(9);
 }
@@ -2657,7 +2657,7 @@ END_TEST
 
 START_TEST(test_sleep14_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(14);
   exit(3);
@@ -2668,7 +2668,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK==1
 START_TEST(test_early_exit)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   exit(EXIT_FAILURE);
 }
@@ -2687,7 +2687,7 @@ START_TEST(test_null)
   Suite *s;
   TCase *tc;
   
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   s = suite_create(NULL);
   tc = tcase_create(NULL);
@@ -2706,7 +2706,7 @@ START_TEST(test_null_2)
 {
   SRunner *sr = srunner_create(NULL);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   srunner_run_all (sr, CK_NORMAL);
   srunner_free (sr);
@@ -2721,7 +2721,7 @@ START_TEST(test_fork1p_pass)
 {
   pid_t pid;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   if((pid = fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2740,7 +2740,7 @@ START_TEST(test_fork1p_fail)
 {
   pid_t pid;
   
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   if((pid = fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2760,7 +2760,7 @@ START_TEST(test_fork1c_pass)
 {
   pid_t pid;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2777,7 +2777,7 @@ START_TEST(test_fork1c_fail)
 {
   pid_t pid;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2795,7 +2795,7 @@ START_TEST(test_fork2_pass)
   pid_t pid;
   pid_t pid2;
   
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2817,7 +2817,7 @@ START_TEST(test_fork2_fail)
   pid_t pid;
   pid_t pid2;
   
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2845,7 +2845,7 @@ START_TEST(test_invalid_set_fork_status)
    TCase *tc1;
    SRunner *sr;
 
-   record_test_name(tcase_name());
+   record_test_name(tcase_name(tcase_current()));
 
    record_failure_line_num(__LINE__-9); /* -9 as the failure is reported at START_TEST() */
    s1 = suite_create ("suite1");
@@ -2864,7 +2864,7 @@ START_TEST(test_srunner)
   Suite *s;
   SRunner *sr;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   s = suite_create("Check Servant3");
   ck_assert_msg(s != NULL, NULL);
@@ -2888,7 +2888,7 @@ END_TEST
 
 START_TEST(test_2nd_suite)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
   record_failure_line_num(__LINE__);
   ck_abort_msg("We failed");
 }
@@ -2920,7 +2920,7 @@ START_TEST(test_ignore_exit_handlers)
 {
   int result;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_name(tcase_current()));
 
   result = atexit(exit_handler);
   if(result != 0)

From 101efc6d7c8dd0b938e4e2bf45357ca58722335a Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Fri, 3 Jul 2026 22:26:35 -0700
Subject: [PATCH 08/13] Revert "Change tcase_name() API to take a TCase"

This reverts commit c259dc06577772c88cbdc8d2ed15f1d50716b1df.
---
 src/check.c             |  20 +-
 src/check.h.in          |  27 +--
 src/check_run.c         |   6 +-
 tests/check_check_sub.c | 406 ++++++++++++++++++++--------------------
 4 files changed, 219 insertions(+), 240 deletions(-)

diff --git a/src/check.c b/src/check.c
index 5daad643..185c4c8a 100644
--- a/src/check.c
+++ b/src/check.c
@@ -52,7 +52,7 @@ int check_major_version = CHECK_MAJOR_VERSION;
 int check_minor_version = CHECK_MINOR_VERSION;
 int check_micro_version = CHECK_MICRO_VERSION;
 
-static TCase *current_test_case = NULL;
+const char* current_test_name = NULL;
 
 static int non_pass(enum test_result);
 static Fixture *fixture_create(SFun fun, int ischecked);
@@ -410,26 +410,18 @@ void tcase_set_timeout(TCase * tc, double timeout)
 #endif /* HAVE_FORK */
 }
 
-void _tcase_fn_start(TCase * tc, const char *fname,
-                     const char *file, int line)
+void tcase_fn_start(const char *fname, const char *file,
+                    int line)
 {
     send_ctx_info(CK_CTX_TEST);
     send_loc_info(file, line);
 
-    current_test_case = tc;
+    current_test_name = fname;
 }
 
-TCase *tcase_current(void)
+const char* tcase_name(void)
 {
-    return current_test_case;
-}
-
-const char *tcase_name(TCase * tc)
-{
-    if(tc == NULL)
-        return NULL;
-
-    return tc->name;
+    return current_test_name;
 }
 
 void _mark_point(const char *file, int line)
diff --git a/src/check.h.in b/src/check.h.in
index 7f041e5c..1352ca61 100644
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -509,29 +509,18 @@ CK_DLL_EXP void CK_EXPORT tcase_add_checked_fixture(TCase * tc, SFun setup,
 CK_DLL_EXP void CK_EXPORT tcase_set_timeout(TCase * tc, double timeout);
 
 /* Internal function to mark the start of a test function */
-CK_DLL_EXP void CK_EXPORT _tcase_fn_start(TCase * tc, const char *fname,
-                                          const char *file, int line);
+CK_DLL_EXP void CK_EXPORT tcase_fn_start(const char *fname, const char *file,
+                                         int line);
 
 /**
- * Retrieve the current running test case.
+ * Retreive the name of the current running test. This is the name
+ * of the test passed to START_TEST. This is only valid when called
+ * from a running test. The value return outside of a running test is
+ * undefined.
  *
- * This is only valid when called from a running test. The value
- * returned outside of a running test is undefined.
- *
- * @since 0.15.3
- */
-CK_DLL_EXP TCase * CK_EXPORT tcase_current(void);
-
-/**
- * Retreive the name of a test case.
- *
- * @param tc test case to get the name of
- *
- * @return the name of the test case
- *
- * @since 0.15.3
+ * @since 0.11.0
  */
-CK_DLL_EXP const char * CK_EXPORT tcase_name(TCase * tc);
+CK_DLL_EXP const char* CK_EXPORT tcase_name(void);
 
 CK_DLL_EXP int CK_EXPORT tcase_ntests(TCase * tc);
 CK_DLL_EXP TTest ** CK_EXPORT tcase_tests(TCase * tc);
diff --git a/src/check_run.c b/src/check_run.c
index 6340f4e8..5f160e50 100644
--- a/src/check_run.c
+++ b/src/check_run.c
@@ -416,8 +416,7 @@ static TestResult *tcase_run_tfun_nofork(SRunner * sr, TCase * tc, TF * tfun,
         clock_gettime(check_get_clockid(), &ts_start);
         if(0 == setjmp(error_jmp_buffer))
         {
-            _tcase_fn_start(tc, tfun->ttest->name, tfun->ttest->file,
-                            tfun->ttest->line);
+            tcase_fn_start(tfun->ttest->name, tfun->ttest->file, tfun->ttest->line);
             tfun->ttest->fn(i);
         }
         clock_gettime(check_get_clockid(), &ts_end);
@@ -494,8 +493,7 @@ static TestResult *tcase_run_tfun_fork(SRunner * sr, TCase * tc, TF * tfun,
         tr = tcase_run_checked_setup(sr, tc);
         free(tr);
         clock_gettime(check_get_clockid(), &ts_start);
-        _tcase_fn_start(tc, tfun->ttest->name, tfun->ttest->file,
-                        tfun->ttest->line);
+        tcase_fn_start(tfun->ttest->name, tfun->ttest->file, tfun->ttest->line);
         tfun->ttest->fn(i);
         clock_gettime(check_get_clockid(), &ts_end);
         tcase_run_checked_teardown(tc);
diff --git a/tests/check_check_sub.c b/tests/check_check_sub.c
index 2a1b5deb..b581d5c7 100644
--- a/tests/check_check_sub.c
+++ b/tests/check_check_sub.c
@@ -29,7 +29,7 @@
 
 START_TEST(test_lno)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_abort_msg("Failure expected");
@@ -39,7 +39,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK==1
 START_TEST(test_mark_lno)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   mark_point();
@@ -50,7 +50,7 @@ END_TEST
 
 START_TEST(test_pass)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_msg(1 == 1, "This test should pass");
   ck_assert_msg(9999, "This test should pass");
@@ -59,7 +59,7 @@ END_TEST
 
 START_TEST(test_fail_unless)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   fail_unless(1 == 2, "This test should fail");
@@ -68,7 +68,7 @@ END_TEST
 
 START_TEST(test_fail_if_pass)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   fail_if(1 == 2, "This test should pass");
   fail_if(0, "This test should pass");
@@ -77,7 +77,7 @@ END_TEST
 
 START_TEST(test_fail_if_fail)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   fail_if(1 == 1, "This test should fail");
@@ -86,7 +86,7 @@ END_TEST
 
 START_TEST(test_fail_null_msg)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   fail_unless(2 == 3, NULL);
@@ -96,7 +96,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_no_msg)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   /* taking out the NULL provokes an ISO C99 warning in GCC */
   record_failure_line_num(__LINE__);
@@ -106,7 +106,7 @@ END_TEST
 #endif /* __GNUC__ */
 START_TEST(test_fail_if_null_msg)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   fail_if(2 != 3, NULL);
@@ -116,7 +116,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_if_no_msg)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   /* taking out the NULL provokes an ISO C99 warning in GCC */
   record_failure_line_num(__LINE__);
@@ -129,7 +129,7 @@ START_TEST(test_fail_vararg_msg_1)
   int x = 3;
   int y = 4;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   fail_unless(x == y, "%d != %d", x, y);
@@ -141,7 +141,7 @@ START_TEST(test_fail_vararg_msg_2)
   int x = 5;
   int y = 6;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   fail_if(x != y, "%d != %d", x, y);
@@ -153,7 +153,7 @@ START_TEST(test_fail_vararg_msg_3)
   int x = 7;
   int y = 7;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   fail("%d == %d", x, y);
@@ -163,7 +163,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_empty)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   /* plain fail() doesn't compile with xlc in C mode because of `, ## __VA_ARGS__' problem */
   /* on the other hand, taking out the NULL provokes an ISO C99 warning in GCC */
@@ -175,7 +175,7 @@ END_TEST
 
 START_TEST(test_ck_abort)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_abort();
@@ -184,7 +184,7 @@ END_TEST
 
 START_TEST(test_ck_abort_msg)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_abort_msg("Failure expected");
@@ -194,7 +194,7 @@ END_TEST
 /* FIXME: perhaps passing NULL to ck_abort_msg should be an error. */
 START_TEST(test_ck_abort_msg_null)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_abort_msg(NULL);
@@ -209,7 +209,7 @@ START_TEST(test_ck_assert)
   int x = 3;
   int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert(1);
   ck_assert(x == y);
@@ -222,7 +222,7 @@ END_TEST
 
 START_TEST(test_ck_assert_null)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert(0);
@@ -233,7 +233,7 @@ START_TEST(test_ck_assert_with_mod)
 {
   int f = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert(1%f == 1);
@@ -245,7 +245,7 @@ START_TEST(test_ck_assert_int_eq)
   int x = 3;
   int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_int_eq(x, y);
   y++;
@@ -259,7 +259,7 @@ START_TEST(test_ck_assert_int_eq_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_eq(3%d, 2%f);
@@ -271,7 +271,7 @@ START_TEST(test_ck_assert_int_ne)
   int x = 3;
   int y = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_int_ne(x, y);
   y++;
@@ -285,7 +285,7 @@ START_TEST(test_ck_assert_int_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_ne(3%d, 3%f);
@@ -297,7 +297,7 @@ START_TEST(test_ck_assert_int_lt)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_int_lt(x, y);
   record_failure_line_num(__LINE__);
@@ -310,7 +310,7 @@ START_TEST(test_ck_assert_int_lt_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_lt(3%d, 3%f);
@@ -322,7 +322,7 @@ START_TEST(test_ck_assert_int_le)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_int_le(x, y);
   ck_assert_int_le(x, x);
@@ -336,7 +336,7 @@ START_TEST(test_ck_assert_int_le_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_le(3%d, 2%f);
@@ -348,7 +348,7 @@ START_TEST(test_ck_assert_int_gt)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_int_gt(y, x);
   record_failure_line_num(__LINE__);
@@ -361,7 +361,7 @@ START_TEST(test_ck_assert_int_gt_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_gt(3%d, 3%f);
@@ -373,7 +373,7 @@ START_TEST(test_ck_assert_int_ge)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_int_ge(y, x);
   ck_assert_int_ge(y, x);
@@ -387,7 +387,7 @@ START_TEST(test_ck_assert_int_ge_with_mod)
   int d = 1;
   int f = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_ge(3%d, 4%f);
@@ -399,7 +399,7 @@ START_TEST(test_ck_assert_int_expr)
   int x = 1;
   int y = 0;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_int_eq(x, ++y);
   ck_assert_int_eq(x, y);
@@ -410,7 +410,7 @@ START_TEST(test_ck_assert_uint_eq)
   unsigned int x = 3;
   unsigned int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_uint_eq(x, y);
   y++;
@@ -424,7 +424,7 @@ START_TEST(test_ck_assert_uint_eq_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_eq(3%d, 1%f);
@@ -436,7 +436,7 @@ START_TEST(test_ck_assert_uint_ne)
   unsigned int x = 3;
   unsigned int y = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_uint_ne(x, y);
   y++;
@@ -450,7 +450,7 @@ START_TEST(test_ck_assert_uint_ne_with_mod)
   int d = 1;
   int f = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_ne(1%d, 1%f);
@@ -462,7 +462,7 @@ START_TEST(test_ck_assert_uint_lt)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_uint_lt(x, y);
   record_failure_line_num(__LINE__);
@@ -475,7 +475,7 @@ START_TEST(test_ck_assert_uint_lt_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_lt(3%d, 1%f);
@@ -487,7 +487,7 @@ START_TEST(test_ck_assert_uint_le)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_uint_le(x, y);
   ck_assert_uint_le(x, x);
@@ -501,7 +501,7 @@ START_TEST(test_ck_assert_uint_le_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_le(3%d, 1%f);
@@ -513,7 +513,7 @@ START_TEST(test_ck_assert_uint_gt)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_uint_gt(y, x);
   record_failure_line_num(__LINE__);
@@ -526,7 +526,7 @@ START_TEST(test_ck_assert_uint_gt_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_gt(1%d, 3%f);
@@ -538,7 +538,7 @@ START_TEST(test_ck_assert_uint_ge)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_uint_ge(y, x);
   ck_assert_uint_ge(y, x);
@@ -552,7 +552,7 @@ START_TEST(test_ck_assert_uint_ge_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_ge(1%d, 3%f);
@@ -564,7 +564,7 @@ START_TEST(test_ck_assert_uint_expr)
   unsigned int x = 1;
   unsigned int y = 0;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_uint_eq(x, ++y);
   ck_assert_uint_eq(x, y);
@@ -575,7 +575,7 @@ START_TEST(test_ck_assert_float_eq)
   float x = 1.1f;
   float y = 1.1f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_eq(x, y);
   y+=0.1f;
@@ -589,7 +589,7 @@ START_TEST(test_ck_assert_float_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_eq(3%d, 2%f);
@@ -601,7 +601,7 @@ START_TEST(test_ck_assert_float_ne)
   float x = 1.1f;
   float y = 1.2f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_ne(x, y);
   y = x;
@@ -615,7 +615,7 @@ START_TEST(test_ck_assert_float_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ne(1%d, 1%f);
@@ -627,7 +627,7 @@ START_TEST(test_ck_assert_float_lt)
   float x = 2.0f;
   float y = 2.5f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_lt(x, y);
   y-=1.0f;
@@ -641,7 +641,7 @@ START_TEST(test_ck_assert_float_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_lt(3%d, 2%f);
@@ -653,7 +653,7 @@ START_TEST(test_ck_assert_float_le)
   float x = 2.0f;
   float y = 2.5f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_le(x, y);
   ck_assert_float_le(x, x);
@@ -668,7 +668,7 @@ START_TEST(test_ck_assert_float_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_le(3%d, 2%f);
@@ -680,7 +680,7 @@ START_TEST(test_ck_assert_float_gt)
   float x = 2.5f;
   float y = 2.0f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_gt(x, y);
   y+=1.0f;
@@ -694,7 +694,7 @@ START_TEST(test_ck_assert_float_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_gt(2%d, 3%f);
@@ -706,7 +706,7 @@ START_TEST(test_ck_assert_float_ge)
   float x = 2.5f;
   float y = 2.0f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_ge(x, y);
   ck_assert_float_ge(x, x);
@@ -721,7 +721,7 @@ START_TEST(test_ck_assert_float_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ge(2%d, 3%f);
@@ -734,7 +734,7 @@ START_TEST(test_ck_assert_float_with_expr)
   float y = 1.1f;
   int i;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   i = 1;
   ck_assert_float_eq(x[i++], y);
@@ -770,7 +770,7 @@ START_TEST(test_ck_assert_float_eq_tol)
   float y = 0.0003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_eq_tol(x, y, t);
   ck_assert_float_eq_tol(x, x, t);
@@ -790,7 +790,7 @@ START_TEST(test_ck_assert_float_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_eq_tol(3%d, 2%f, 2%p);
@@ -803,7 +803,7 @@ START_TEST(test_ck_assert_float_ne_tol)
   float y = 0.0002f;
   float t = 0.0001f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_ne_tol(x, y, t);
   x*=10.0f;
@@ -822,7 +822,7 @@ START_TEST(test_ck_assert_float_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ne_tol(3%d, 3%f, 3%p);
@@ -835,7 +835,7 @@ START_TEST(test_ck_assert_float_ge_tol)
   float y = 0.003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_ge_tol(y, x, t);
   ck_assert_float_ge_tol(x, x, t);
@@ -857,7 +857,7 @@ START_TEST(test_ck_assert_float_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ge_tol(2%d, 3%f, 3%p);
@@ -870,7 +870,7 @@ START_TEST(test_ck_assert_float_le_tol)
   float y = 0.003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_le_tol(x, y, t);
   ck_assert_float_le_tol(x, x, t);
@@ -892,7 +892,7 @@ START_TEST(test_ck_assert_float_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_le_tol(3%d, 2%f, 3%p);
@@ -906,7 +906,7 @@ START_TEST(test_ck_assert_float_tol_with_expr)
   float t = 0.01f;
   int i;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   i = 1;
   ck_assert_float_eq_tol(x[i++], y, t);
@@ -933,7 +933,7 @@ START_TEST(test_ck_assert_float_finite)
   float x = 0.0001f;
   float t = 1.0f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -949,7 +949,7 @@ START_TEST(test_ck_assert_float_finite_with_mod)
   float t = 1.0f;
   float x = 1.0f / (1.0f - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_finite(x*(1%d));
@@ -961,7 +961,7 @@ START_TEST(test_ck_assert_float_infinite)
   float t = 1.0f;
   float x = 1.0f / (1.0f - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_infinite(x);
   x = -1.0f / (1.0f - t);
@@ -976,7 +976,7 @@ START_TEST(test_ck_assert_float_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_infinite(2%d);
@@ -988,7 +988,7 @@ START_TEST(test_ck_assert_float_nan)
   float t = 1.0f;
   float x = 0.0f / (1.0f - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_nan(x);
   x = 1.0f / (1.0f - t);
@@ -1001,7 +1001,7 @@ START_TEST(test_ck_assert_float_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_nan(2%d);
@@ -1013,7 +1013,7 @@ START_TEST(test_ck_assert_float_nonnan)
   float x = 0.0f;
   float t = 1.0f;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_nonnan(x);
 #if ENABLE_REGEX
@@ -1032,7 +1032,7 @@ START_TEST(test_ck_assert_float_nonnan_with_mod)
   float t = 1.0f;
   float x;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_nonnan(2%s);
 #if ENABLE_REGEX
@@ -1051,7 +1051,7 @@ START_TEST(test_ck_assert_float_nan_and_inf_with_expr)
   float x[] = {0.0f, 0.0f, INFINITY, INFINITY, NAN, NAN, 0.0f, 0.0f, NAN};
   int i = 0;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_float_finite(x[i++]);
   ck_assert_float_finite(x[i++]);
@@ -1069,7 +1069,7 @@ START_TEST(test_ck_assert_double_eq)
   double x = 1.1;
   double y = 1.1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_eq(x, y);
   y+=0.1;
@@ -1083,7 +1083,7 @@ START_TEST(test_ck_assert_double_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq(3%d, 2%f);
@@ -1095,7 +1095,7 @@ START_TEST(test_ck_assert_double_eq_with_promotion)
   float x = 0.1F;
   double y = x;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_eq(x, y);
 }
@@ -1105,7 +1105,7 @@ START_TEST(test_ck_assert_double_eq_with_conv)
 {
   float x = 0.1F;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq(x, 0.1);
@@ -1117,7 +1117,7 @@ START_TEST(test_ck_assert_double_ne)
   double x = 1.1;
   double y = 1.2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_ne(x, y);
   y = x;
@@ -1131,7 +1131,7 @@ START_TEST(test_ck_assert_double_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ne(1%d, 1%f);
@@ -1143,7 +1143,7 @@ START_TEST(test_ck_assert_double_lt)
   double x = 2.0;
   double y = 2.5;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_lt(x, y);
   y-=1;
@@ -1157,7 +1157,7 @@ START_TEST(test_ck_assert_double_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_lt(3%d, 2%f);
@@ -1169,7 +1169,7 @@ START_TEST(test_ck_assert_double_le)
   double x = 2.0;
   double y = 2.5;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_le(x, y);
   ck_assert_double_le(x, x);
@@ -1184,7 +1184,7 @@ START_TEST(test_ck_assert_double_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_le(3%d, 2%f);
@@ -1196,7 +1196,7 @@ START_TEST(test_ck_assert_double_gt)
   double x = 2.5;
   double y = 2.0;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_gt(x, y);
   y+=1;
@@ -1210,7 +1210,7 @@ START_TEST(test_ck_assert_double_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_gt(2%d, 3%f);
@@ -1222,7 +1222,7 @@ START_TEST(test_ck_assert_double_ge)
   double x = 2.5;
   double y = 2.0;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_ge(x, y);
   ck_assert_double_ge(x, x);
@@ -1237,7 +1237,7 @@ START_TEST(test_ck_assert_double_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ge(2%d, 3%f);
@@ -1250,7 +1250,7 @@ START_TEST(test_ck_assert_double_with_expr)
   double y = 1.1;
   int i;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   i = 1;
   ck_assert_double_eq(x[i++], y);
@@ -1286,7 +1286,7 @@ START_TEST(test_ck_assert_double_eq_tol)
   double y = 0.0002;
   double t = 0.001;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_eq_tol(x, y, t);
   ck_assert_double_eq_tol(x, x, t);
@@ -1306,7 +1306,7 @@ START_TEST(test_ck_assert_double_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq_tol(3%d, 2%f, 2%p);
@@ -1319,7 +1319,7 @@ START_TEST(test_ck_assert_double_ne_tol)
   double y = 0.0002;
   double t = 0.0001;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_ne_tol(x, y, t);
   x*=10;
@@ -1338,7 +1338,7 @@ START_TEST(test_ck_assert_double_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ne_tol(3%d, 3%f, 3%p);
@@ -1351,7 +1351,7 @@ START_TEST(test_ck_assert_double_ge_tol)
   double y = 0.003;
   double t = 0.001;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_ge_tol(y, x, t);
   ck_assert_double_ge_tol(x, x, t);
@@ -1373,7 +1373,7 @@ START_TEST(test_ck_assert_double_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ge_tol(2%d, 3%f, 3%p);
@@ -1386,7 +1386,7 @@ START_TEST(test_ck_assert_double_le_tol)
   double y = 0.003;
   double t = 0.001;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_le_tol(x, y, t);
   ck_assert_double_le_tol(x, x, t);
@@ -1408,7 +1408,7 @@ START_TEST(test_ck_assert_double_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_le_tol(3%d, 2%f, 3%p);
@@ -1422,7 +1422,7 @@ START_TEST(test_ck_assert_double_tol_with_expr)
   double t = 0.01;
   int i;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   i = 1;
   ck_assert_double_eq_tol(x[i++], y, t);
@@ -1449,7 +1449,7 @@ START_TEST(test_ck_assert_double_finite)
   double x = 0.0001;
   double t = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -1465,7 +1465,7 @@ START_TEST(test_ck_assert_double_finite_with_mod)
   double t = 1;
   double x = 1.0 / (1.0 - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_finite(x*(1%d));
@@ -1477,7 +1477,7 @@ START_TEST(test_ck_assert_double_infinite)
   double t = 1;
   double x = 1.0 / (1.0 - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_infinite(x);
   x = -1.0 / (1.0 - t);
@@ -1492,7 +1492,7 @@ START_TEST(test_ck_assert_double_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_infinite(2%d);
@@ -1504,7 +1504,7 @@ START_TEST(test_ck_assert_double_nan)
   double t = 1;
   double x = 0.0 / (1.0 - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_nan(x);
   x = 1.0 / (1.0 - t);
@@ -1517,7 +1517,7 @@ START_TEST(test_ck_assert_double_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_nan(2%d);
@@ -1529,7 +1529,7 @@ START_TEST(test_ck_assert_double_nonnan)
   double x = 0;
   double t = 1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_nonnan(x);
 #if ENABLE_REGEX
@@ -1548,7 +1548,7 @@ START_TEST(test_ck_assert_double_nonnan_with_mod)
   double t = 1.0;
   double x;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_nonnan(2%s);
 #if ENABLE_REGEX
@@ -1567,7 +1567,7 @@ START_TEST(test_ck_assert_double_nan_and_inf_with_expr)
   double x[] = {0.0, 0.0, INFINITY, INFINITY, NAN, NAN, 0.0, 0.0, NAN};
   int i = 0;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_double_finite(x[i++]);
   ck_assert_double_finite(x[i++]);
@@ -1585,7 +1585,7 @@ START_TEST(test_ck_assert_ldouble_eq)
   long double x = 1.1l;
   long double y = 1.1l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_eq(x, y);
   y+=0.1l;
@@ -1599,7 +1599,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_eq(3%d, 2%f);
@@ -1611,7 +1611,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_promotion)
   float x = 1.1F;
   long double y = x;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_eq(x, y);
 }
@@ -1622,7 +1622,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_conv)
   float x = 1.1F;
   long double y = x;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_eq(x, y);
   record_failure_line_num(__LINE__);
@@ -1635,7 +1635,7 @@ START_TEST(test_ck_assert_ldouble_ne)
   long double x = 1.1l;
   long double y = 1.2l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_ne(x, y);
   y = x;
@@ -1649,7 +1649,7 @@ START_TEST(test_ck_assert_ldouble_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ne(1%d, 1%f);
@@ -1661,7 +1661,7 @@ START_TEST(test_ck_assert_ldouble_lt)
   long double x = 2.0l;
   long double y = 2.5l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_lt(x, y);
   y-=1.0l;
@@ -1675,7 +1675,7 @@ START_TEST(test_ck_assert_ldouble_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_lt(3%d, 2%f);
@@ -1687,7 +1687,7 @@ START_TEST(test_ck_assert_ldouble_le)
   long double x = 2.0l;
   long double y = 2.5l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_le(x, y);
   ck_assert_ldouble_le(x, x);
@@ -1702,7 +1702,7 @@ START_TEST(test_ck_assert_ldouble_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_le(3%d, 2%f);
@@ -1714,7 +1714,7 @@ START_TEST(test_ck_assert_ldouble_gt)
   long double x = 2.5l;
   long double y = 2.0l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_gt(x, y);
   y+=1.0l;
@@ -1728,7 +1728,7 @@ START_TEST(test_ck_assert_ldouble_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_gt(2%d, 3%f);
@@ -1740,7 +1740,7 @@ START_TEST(test_ck_assert_ldouble_ge)
   long double x = 2.5l;
   long double y = 2.0l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_ge(x, y);
   ck_assert_ldouble_ge(x, x);
@@ -1755,7 +1755,7 @@ START_TEST(test_ck_assert_ldouble_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ge(2%d, 3%f);
@@ -1768,7 +1768,7 @@ START_TEST(test_ck_assert_ldouble_with_expr)
   long double y = 1.1l;
   int i;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   i = 1;
   ck_assert_ldouble_eq(x[i++], y);
@@ -1804,7 +1804,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol)
   long double y = 0.0002l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_eq_tol(x, y, t);
   ck_assert_ldouble_eq_tol(x, x, t);
@@ -1824,7 +1824,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_eq_tol(3%d, 2%f, 2%p);
@@ -1837,7 +1837,7 @@ START_TEST(test_ck_assert_ldouble_ne_tol)
   long double y = 0.0002l;
   long double t = 0.0001l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_ne_tol(x, y, t);
   x*=10.0l;
@@ -1856,7 +1856,7 @@ START_TEST(test_ck_assert_ldouble_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ne_tol(3%d, 3%f, 3%p);
@@ -1869,7 +1869,7 @@ START_TEST(test_ck_assert_ldouble_ge_tol)
   long double y = 0.003l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_ge_tol(y, x, t);
   ck_assert_ldouble_ge_tol(x, x, t);
@@ -1891,7 +1891,7 @@ START_TEST(test_ck_assert_ldouble_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ge_tol(2%d, 3%f, 3%p);
@@ -1904,7 +1904,7 @@ START_TEST(test_ck_assert_ldouble_le_tol)
   long double y = 0.003l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_le_tol(x, y, t);
   ck_assert_ldouble_le_tol(x, x, t);
@@ -1926,7 +1926,7 @@ START_TEST(test_ck_assert_ldouble_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_le_tol(3%d, 2%f, 3%p);
@@ -1940,7 +1940,7 @@ START_TEST(test_ck_assert_ldouble_tol_with_expr)
   long double t = 0.01l;
   int i;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   i = 1;
   ck_assert_ldouble_eq_tol(x[i++], y, t);
@@ -1967,7 +1967,7 @@ START_TEST(test_ck_assert_ldouble_finite)
   long double x = 0.0001l;
   long double t = 1.0l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -1983,7 +1983,7 @@ START_TEST(test_ck_assert_ldouble_finite_with_mod)
   long double t = 1.0l;
   long double x = 1.0l / (1.0l - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_finite(x*(1%d));
@@ -1995,7 +1995,7 @@ START_TEST(test_ck_assert_ldouble_infinite)
   long double t = 1.0l;
   long double x = 1.0l / (1.0l - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_infinite(x);
   x = -1.0l / (1.0l - t);
@@ -2010,7 +2010,7 @@ START_TEST(test_ck_assert_ldouble_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_infinite(2%d);
@@ -2022,7 +2022,7 @@ START_TEST(test_ck_assert_ldouble_nan)
   long double t = 1.0l;
   long double x = 0.0l / (1.0l - t);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_nan(x);
   x = 1.0l / (1.0l - t);
@@ -2035,7 +2035,7 @@ START_TEST(test_ck_assert_ldouble_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_nan(2%d);
@@ -2047,7 +2047,7 @@ START_TEST(test_ck_assert_ldouble_nonnan)
   long double x = 0.0l;
   long double t = 1.0l;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_nonnan(x);
 #if ENABLE_REGEX
@@ -2066,7 +2066,7 @@ START_TEST(test_ck_assert_ldouble_nonnan_with_mod)
   long double t = 1.0l;
   long double x;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_nonnan(2%s);
 #if ENABLE_REGEX
@@ -2085,7 +2085,7 @@ START_TEST(test_ck_assert_ldouble_nan_and_inf_with_expr)
   long double x[] = {0.0l, 0.0l, INFINITY, INFINITY, NAN, NAN, 0.0l, 0.0l, NAN};
   int i = 0;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ldouble_finite(x[i++]);
   ck_assert_ldouble_finite(x[i++]);
@@ -2107,7 +2107,7 @@ int returnsZero(const char* argument)
 
 START_TEST(test_percent_n_escaped)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   /* If the %n is not escaped in the ck macro, then this results in a SEGFAULT */
   record_failure_line_num(__LINE__);
@@ -2118,7 +2118,7 @@ START_TEST(test_ck_assert_str_eq)
 {
   const char *s = "test2";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_str_eq("test2", s);
   record_failure_line_num(__LINE__);
@@ -2131,7 +2131,7 @@ START_TEST(test_ck_assert_str_eq_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_eq(t, s);
@@ -2143,7 +2143,7 @@ START_TEST(test_ck_assert_str_ne)
   const char *s = "test2";
   const char *t = "test1";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_str_ne(t, s);
   t = "test2";
@@ -2157,7 +2157,7 @@ START_TEST(test_ck_assert_str_ne_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_ne(t, s);
@@ -2169,7 +2169,7 @@ START_TEST(test_ck_assert_str_lt)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_str_lt(s, t);
   record_failure_line_num(__LINE__);
@@ -2182,7 +2182,7 @@ START_TEST(test_ck_assert_str_lt_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_lt(s, t);
@@ -2194,7 +2194,7 @@ START_TEST(test_ck_assert_str_le)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_str_le(s, t);
   ck_assert_str_le(s, s);
@@ -2208,7 +2208,7 @@ START_TEST(test_ck_assert_str_le_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_le(t, s);
@@ -2220,7 +2220,7 @@ START_TEST(test_ck_assert_str_gt)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_str_gt(t, s);
   record_failure_line_num(__LINE__);
@@ -2233,7 +2233,7 @@ START_TEST(test_ck_assert_str_gt_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_gt(t, s);
@@ -2245,7 +2245,7 @@ START_TEST(test_ck_assert_str_ge)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_str_ge(t, s);
   ck_assert_str_ge(t, t);
@@ -2259,7 +2259,7 @@ START_TEST(test_ck_assert_str_ge_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_ge(s, t);
@@ -2272,7 +2272,7 @@ START_TEST(test_ck_assert_str_expr)
   const char *t[] = { "test1", "test2" };
   int i = -1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_str_eq(s, t[++i]);
   ck_assert_str_eq(s, t[i]);
@@ -2283,7 +2283,7 @@ START_TEST(test_ck_assert_pstr_eq)
 {
   const char *s = "test";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_pstr_eq("test", s);
   ck_assert_pstr_eq(NULL, NULL);
@@ -2297,7 +2297,7 @@ START_TEST(test_ck_assert_pstr_eq_with_null)
   const char *t = "test";
   const char *s = NULL;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_pstr_eq(t, s);
@@ -2309,7 +2309,7 @@ START_TEST(test_ck_assert_pstr_ne)
   const char *t = "test1";
   const char *s = "test2";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_pstr_ne(t, s);
   ck_assert_pstr_ne(t, NULL);
@@ -2324,7 +2324,7 @@ START_TEST(test_ck_assert_pstr_ne_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_pstr_ne(t, s);
@@ -2336,7 +2336,7 @@ START_TEST(test_ck_assert_ptr_eq)
   int * x = (int*)0x1;
   int * y = (int*)0x2;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ptr_eq(NULL, NULL);
   ck_assert_ptr_eq(x,    x);
@@ -2351,7 +2351,7 @@ START_TEST(test_ck_assert_ptr_ne)
   int * y = (int*)0x2;
   int * z = x;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ptr_ne(x,    y);
   ck_assert_ptr_ne(x,    NULL);
@@ -2366,7 +2366,7 @@ START_TEST(test_ck_assert_ptr_null)
   void* x = (void*)0x1;
   void* y = NULL;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ptr_null(y);
   record_failure_line_num(__LINE__);
@@ -2379,7 +2379,7 @@ START_TEST(test_ck_assert_ptr_nonnull)
   void* x = NULL;
   void* y = (void*)0x1;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_ptr_nonnull(y);
   record_failure_line_num(__LINE__);
@@ -2391,7 +2391,7 @@ START_TEST(test_ck_assert_mem_eq)
 {
   const char *s = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_mem_eq("\x00\x00\x00\x00\x02", s, 5);
   record_failure_line_num(__LINE__);
@@ -2404,7 +2404,7 @@ START_TEST(test_ck_assert_mem_ne)
   const char *s = "\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_mem_ne(t, s, 5);
   t = "\x00\x00\x00\x00\x02";
@@ -2418,7 +2418,7 @@ START_TEST(test_ck_assert_mem_lt)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_mem_lt(s, t, 5);
   record_failure_line_num(__LINE__);
@@ -2431,7 +2431,7 @@ START_TEST(test_ck_assert_mem_le)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_mem_le(s, t, 5);
   ck_assert_mem_le(s, s, 5);
@@ -2445,7 +2445,7 @@ START_TEST(test_ck_assert_mem_gt)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_mem_gt(t, s, 5);
   record_failure_line_num(__LINE__);
@@ -2458,7 +2458,7 @@ START_TEST(test_ck_assert_mem_ge)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_mem_ge(t, s, 5);
   ck_assert_mem_ge(t, t, 5);
@@ -2472,7 +2472,7 @@ START_TEST(test_ck_assert_mem_zerolen)
   const char *s = "\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   ck_assert_mem_eq(t, s, 0);
 }
@@ -2483,7 +2483,7 @@ START_TEST(test_ck_assert_mem_eq_exact)
   const char *s = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_mem_eq(t, s, 64);
@@ -2495,7 +2495,7 @@ START_TEST(test_ck_assert_mem_eq_longer)
   const char *s = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_mem_eq(t, s, 65);
@@ -2505,7 +2505,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK == 1
 START_TEST(test_segv_pass)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   /*
    * This test is to be used when it would otherwise not cause a
    * failure. e.g., shen SIGSEGV is expected.
@@ -2516,7 +2516,7 @@ END_TEST
 
 START_TEST(test_segv)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   raise (SIGSEGV);
 }
@@ -2529,7 +2529,7 @@ END_TEST
 #if !defined(__CYGWIN__)
 START_TEST(test_fpe)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   raise (SIGFPE);
 }
@@ -2542,7 +2542,7 @@ END_TEST
  */
 START_TEST(test_non_signal_8)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   exit(0);
 }
@@ -2559,7 +2559,7 @@ END_TEST
 START_TEST(test_mark_point)
 {
   int i;
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   i = 0;
   i++;
   mark_point();
@@ -2575,7 +2575,7 @@ END_TEST
 #if TIMEOUT_TESTS_ENABLED && defined(HAVE_FORK) && HAVE_FORK == 1
 START_TEST(test_eternal_fail)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   for (;;)
     sleep(1);
@@ -2589,21 +2589,21 @@ END_TEST
 #ifdef HAVE_LIBRT
 START_TEST(test_sleep0_025_pass)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   usleep(25*1000);
 }
 END_TEST
 
 START_TEST(test_sleep1_pass)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   sleep(1);
 }
 END_TEST
 
 START_TEST(test_sleep1_fail)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(1);
 }
@@ -2612,14 +2612,14 @@ END_TEST
 
 START_TEST(test_sleep2_pass)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   sleep(2);
 }
 END_TEST
 
 START_TEST(test_sleep2_fail)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(2);
 }
@@ -2627,14 +2627,14 @@ END_TEST
 
 START_TEST(test_sleep5_pass)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   sleep(5);
 }
 END_TEST
 
 START_TEST(test_sleep5_fail)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(5);
 }
@@ -2642,14 +2642,14 @@ END_TEST
 
 START_TEST(test_sleep9_pass)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   sleep(9);
 }
 END_TEST
 
 START_TEST(test_sleep9_fail)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(9);
 }
@@ -2657,7 +2657,7 @@ END_TEST
 
 START_TEST(test_sleep14_fail)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(14);
   exit(3);
@@ -2668,7 +2668,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK==1
 START_TEST(test_early_exit)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   exit(EXIT_FAILURE);
 }
@@ -2687,7 +2687,7 @@ START_TEST(test_null)
   Suite *s;
   TCase *tc;
   
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   s = suite_create(NULL);
   tc = tcase_create(NULL);
@@ -2706,7 +2706,7 @@ START_TEST(test_null_2)
 {
   SRunner *sr = srunner_create(NULL);
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   srunner_run_all (sr, CK_NORMAL);
   srunner_free (sr);
@@ -2721,7 +2721,7 @@ START_TEST(test_fork1p_pass)
 {
   pid_t pid;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   if((pid = fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2740,7 +2740,7 @@ START_TEST(test_fork1p_fail)
 {
   pid_t pid;
   
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   if((pid = fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2760,7 +2760,7 @@ START_TEST(test_fork1c_pass)
 {
   pid_t pid;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2777,7 +2777,7 @@ START_TEST(test_fork1c_fail)
 {
   pid_t pid;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2795,7 +2795,7 @@ START_TEST(test_fork2_pass)
   pid_t pid;
   pid_t pid2;
   
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2817,7 +2817,7 @@ START_TEST(test_fork2_fail)
   pid_t pid;
   pid_t pid2;
   
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2845,7 +2845,7 @@ START_TEST(test_invalid_set_fork_status)
    TCase *tc1;
    SRunner *sr;
 
-   record_test_name(tcase_name(tcase_current()));
+   record_test_name(tcase_name());
 
    record_failure_line_num(__LINE__-9); /* -9 as the failure is reported at START_TEST() */
    s1 = suite_create ("suite1");
@@ -2864,7 +2864,7 @@ START_TEST(test_srunner)
   Suite *s;
   SRunner *sr;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   s = suite_create("Check Servant3");
   ck_assert_msg(s != NULL, NULL);
@@ -2888,7 +2888,7 @@ END_TEST
 
 START_TEST(test_2nd_suite)
 {
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
   record_failure_line_num(__LINE__);
   ck_abort_msg("We failed");
 }
@@ -2920,7 +2920,7 @@ START_TEST(test_ignore_exit_handlers)
 {
   int result;
 
-  record_test_name(tcase_name(tcase_current()));
+  record_test_name(tcase_name());
 
   result = atexit(exit_handler);
   if(result != 0)

From bd93d91eae66408ebdf8f58a925d895182101ebc Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Thu, 2 Jul 2026 22:04:36 -0700
Subject: [PATCH 09/13] Add tcase_{ntests,tests} and tf_* APIs.

---
 src/check.c      | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/check.h.in   | 13 ++++++++-
 src/check_impl.h |  4 +--
 3 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/src/check.c b/src/check.c
index 185c4c8a..00431e4e 100644
--- a/src/check.c
+++ b/src/check.c
@@ -424,6 +424,76 @@ const char* tcase_name(void)
     return current_test_name;
 }
 
+int tcase_ntests(TCase * tc)
+{
+    if(tc == NULL)
+        return 0;
+    
+    return check_list_length(tc->tflst);
+}
+
+TF **tcase_tests(TCase * tc)
+{
+    int i = 0;
+    List *tflst;
+    TF **tfarray;
+    
+    if(tc == NULL)
+        return NULL;
+
+    tfarray = (TF **)emalloc(sizeof(tfarray[0]) * tcase_ntests(tc));
+    
+    tflst = tc->tflst;
+    for(check_list_front(tflst); !check_list_at_end(tflst);
+        check_list_advance(tflst))
+    {
+        TF *tf = (TF *)check_list_val(tflst);
+        tfarray[i++] = tf;
+    }
+    
+    return tfarray;
+}
+
+const TTest *tf_test(TF * tf)
+{
+    if(tf == NULL)
+        return NULL;
+
+    return tf->ttest;
+}
+
+int tf_loop_start(TF * tf)
+{
+    if(tf == NULL)
+        return 0;
+
+    return tf->loop_start;
+}
+
+int tf_loop_end(TF * tf)
+{
+    if(tf == NULL)
+        return 0;
+
+    return tf->loop_end;
+}
+
+int tf_signal(TF * tf)
+{
+    if(tf == NULL)
+        return 0;
+
+    return tf->signal;
+}
+
+int tf_allowed_exit_value(TF * tf)
+{
+    if(tf == NULL)
+        return 0;
+
+    return tf->allowed_exit_value;
+}
+
 void _mark_point(const char *file, int line)
 {
     send_loc_info(file, line);
diff --git a/src/check.h.in b/src/check.h.in
index 1352ca61..cf7c7066 100644
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -182,6 +182,11 @@ typedef struct TTest {
     int line;
 } TTest;
 
+/**
+ * Type for a test fixture, which wraps a test.
+ */
+typedef struct TF TF;
+
 /**
  * Creates a test suite with the given name.
  *
@@ -523,7 +528,13 @@ CK_DLL_EXP void CK_EXPORT tcase_fn_start(const char *fname, const char *file,
 CK_DLL_EXP const char* CK_EXPORT tcase_name(void);
 
 CK_DLL_EXP int CK_EXPORT tcase_ntests(TCase * tc);
-CK_DLL_EXP TTest ** CK_EXPORT tcase_tests(TCase * tc);
+CK_DLL_EXP TF ** CK_EXPORT tcase_tests(TCase * tc);
+
+CK_DLL_EXP const TTest * CK_EXPORT tf_test(TF * tf);
+CK_DLL_EXP int CK_EXPORT tf_loop_start(TF * tf);
+CK_DLL_EXP int CK_EXPORT tf_loop_end(TF * tf);
+CK_DLL_EXP int CK_EXPORT tf_signal(TF * tf);
+CK_DLL_EXP int CK_EXPORT tf_allowed_exit_value(TF * tf);
 
 /**
  * Start a unit test with START_TEST(unit_name), end with END_TEST.
diff --git a/src/check_impl.h b/src/check_impl.h
index f4e8c590..0a37d27f 100644
--- a/src/check_impl.h
+++ b/src/check_impl.h
@@ -34,14 +34,14 @@
   ( (((end).tv_sec - (begin).tv_sec) * US_PER_SEC) + \
     ((end).tv_nsec/1000) - ((begin).tv_nsec/1000) )
 
-typedef struct TF
+struct TF
 {
     const TTest * ttest;
     int loop_start;
     int loop_end;
     int signal;
     signed char allowed_exit_value;
-} TF;
+};
 
 struct Suite
 {

From 655a6e87d3072cd769cf3e61a0414e3123e51b3b Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Thu, 2 Jul 2026 22:13:13 -0700
Subject: [PATCH 10/13] Add check_list_as_array() function.

---
 src/check_list.c | 21 +++++++++++++++++++++
 src/check_list.h |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/src/check_list.c b/src/check_list.c
index 13aad08c..be33e449 100644
--- a/src/check_list.c
+++ b/src/check_list.c
@@ -160,3 +160,24 @@ unsigned int check_list_length(List * lp)
 
     return lp->n_elts;
 }
+
+void **check_list_as_array(List * lp)
+{
+    void **ap;
+    List *l;
+    int i = 0;
+
+    if(lp == NULL)
+        return NULL;
+
+    ap = emalloc(sizeof(void *) * check_list_length(lp));
+
+    l = lp;
+    for(check_list_front(l); !check_list_at_end(l); check_list_advance(l))
+    {
+        void *val = check_list_val(l);
+        ap[i++] = val;
+    }
+
+    return ap;
+}
diff --git a/src/check_list.h b/src/check_list.h
index cfb90aaa..a6f9084e 100644
--- a/src/check_list.h
+++ b/src/check_list.h
@@ -58,4 +58,7 @@ int check_list_contains(List * lp, void *val);
 /* Return the number of elements in the list */
 unsigned int check_list_length(List * lp);
 
+/* Return a new array with a snapshot of the list's contents. */
+void **check_list_as_array(List * lp);
+
 #endif /* CHECK_LIST_H */

From 8cfd97c9078e1c0a3a458dfa0fd8fb4173f31138 Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Thu, 2 Jul 2026 22:13:28 -0700
Subject: [PATCH 11/13] Use check_list_as_array().

---
 src/check.c | 81 ++++++-----------------------------------------------
 1 file changed, 9 insertions(+), 72 deletions(-)

diff --git a/src/check.c b/src/check.c
index 00431e4e..5f91bf8c 100644
--- a/src/check.c
+++ b/src/check.c
@@ -93,23 +93,10 @@ int suite_ntcases(Suite * s)
 
 TCase **suite_tcases(Suite * s)
 {
-    int i = 0;
-    TCase **tcarray;
-    List *l;
-
     if(s == NULL)
         return NULL;
 
-    tcarray = (TCase **)emalloc(sizeof(tcarray[0]) * suite_ntcases(s));
-
-    l = s->tclst;
-    for(check_list_front(l); !check_list_at_end(l); check_list_advance(l))
-    {
-        TCase *tc = (TCase *)check_list_val(l);
-        tcarray[i++] = tc;
-    }
-
-    return tcarray;
+    return (TCase **)check_list_as_array(s->tclst);
 }
 
 int suite_tcase(Suite * s, const char *tcname)
@@ -246,23 +233,10 @@ int tcase_ntags(TCase * tc)
 
 const char **tcase_tags(TCase * tc)
 {
-    int i = 0;
-    List *l;
-    const char **tarray;
-    
     if(tc == NULL)
         return NULL;
-    
-    tarray = emalloc(sizeof(tarray[0]) * tcase_ntags(tc));
-    
-    l = tc->tags;
-    for(check_list_front(l); !check_list_at_end(l); check_list_advance(l))
-    {
-        const char *tag = (const char *)check_list_val(l);
-        tarray[i++] = tag;
-    }
-    
-    return tarray;
+        
+    return (const char **)check_list_as_array(tc->tags);
 }
 
 static void tcase_free(TCase * tc)
@@ -434,24 +408,10 @@ int tcase_ntests(TCase * tc)
 
 TF **tcase_tests(TCase * tc)
 {
-    int i = 0;
-    List *tflst;
-    TF **tfarray;
-    
     if(tc == NULL)
         return NULL;
-
-    tfarray = (TF **)emalloc(sizeof(tfarray[0]) * tcase_ntests(tc));
-    
-    tflst = tc->tflst;
-    for(check_list_front(tflst); !check_list_at_end(tflst);
-        check_list_advance(tflst))
-    {
-        TF *tf = (TF *)check_list_val(tflst);
-        tfarray[i++] = tf;
-    }
-    
-    return tfarray;
+        
+    return (TF **)check_list_as_array(tc->tflst);
 }
 
 const TTest *tf_test(TF * tf)
@@ -583,24 +543,10 @@ int srunner_nsuites(SRunner * sr)
 
 Suite **srunner_suites(SRunner * sr)
 {
-    int i = 0;
-    Suite **sarray;
-    List *slst;
-
     if (sr == NULL)
         return NULL;
 
-    sarray = (Suite **)emalloc(sizeof(sarray[0]) * srunner_nsuites(sr));
-
-    slst = sr->slst;
-    for(check_list_front(slst); !check_list_at_end(slst);
-        check_list_advance(slst))
-    {
-        Suite *s = (Suite *)check_list_val(slst);
-        sarray[i++] = s;
-    }
-
-    return sarray;
+    return (Suite **)check_list_as_array(sr->slst);
 }
 
 void srunner_free(SRunner * sr)
@@ -662,19 +608,10 @@ TestResult **srunner_failures(SRunner * sr)
 
 TestResult **srunner_results(SRunner * sr)
 {
-    int i = 0;
-    TestResult **trarray;
-    List *rlst;
-
-    trarray =(TestResult **) emalloc(sizeof(trarray[0]) * srunner_ntests_run(sr));
+    if(sr == NULL)
+        return NULL;
 
-    rlst = sr->resultlst;
-    for(check_list_front(rlst); !check_list_at_end(rlst);
-        check_list_advance(rlst))
-    {
-        trarray[i++] = (TestResult *)check_list_val(rlst);
-    }
-    return trarray;
+    return (TestResult **)check_list_as_array(sr->resultlst);
 }
 
 static int non_pass(enum test_result val)

From ff0294a52977b864f322fffdb24c1f1639ebdadd Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Fri, 3 Jul 2026 22:32:29 -0700
Subject: [PATCH 12/13] Change tcase_name() API to take a TCase

For consistency with other API, `tcase_name()` now takes a TCase and returns
its name, rather than returning the name of the currently-running test case.
The name of the currently-running test case is exposed by a new API,
`tcase_current_name()`.
---
 src/check.c             |  10 +-
 src/check.h.in          |  13 +-
 tests/check_check_sub.c | 406 ++++++++++++++++++++--------------------
 3 files changed, 224 insertions(+), 205 deletions(-)

diff --git a/src/check.c b/src/check.c
index 5f91bf8c..55f5e7fa 100644
--- a/src/check.c
+++ b/src/check.c
@@ -393,11 +393,19 @@ void tcase_fn_start(const char *fname, const char *file,
     current_test_name = fname;
 }
 
-const char* tcase_name(void)
+const char* tcase_current_name(void)
 {
     return current_test_name;
 }
 
+const char *tcase_name(TCase * tc)
+{
+    if(tc == NULL)
+        return NULL;
+
+    return tc->name;
+}
+
 int tcase_ntests(TCase * tc)
 {
     if(tc == NULL)
diff --git a/src/check.h.in b/src/check.h.in
index cf7c7066..b39e2d76 100644
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -525,7 +525,18 @@ CK_DLL_EXP void CK_EXPORT tcase_fn_start(const char *fname, const char *file,
  *
  * @since 0.11.0
  */
-CK_DLL_EXP const char* CK_EXPORT tcase_name(void);
+CK_DLL_EXP const char* CK_EXPORT tcase_current_name(void);
+
+/**
+ * Retreive the name of a test case.
+ *
+ * @param tc test case to get the name of
+ *
+ * @return the name of the test case
+ *
+ * @since 0.15.3
+ */
+CK_DLL_EXP const char * CK_EXPORT tcase_name(TCase * tc);
 
 CK_DLL_EXP int CK_EXPORT tcase_ntests(TCase * tc);
 CK_DLL_EXP TF ** CK_EXPORT tcase_tests(TCase * tc);
diff --git a/tests/check_check_sub.c b/tests/check_check_sub.c
index b581d5c7..70b82e94 100644
--- a/tests/check_check_sub.c
+++ b/tests/check_check_sub.c
@@ -29,7 +29,7 @@
 
 START_TEST(test_lno)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_abort_msg("Failure expected");
@@ -39,7 +39,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK==1
 START_TEST(test_mark_lno)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   mark_point();
@@ -50,7 +50,7 @@ END_TEST
 
 START_TEST(test_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_msg(1 == 1, "This test should pass");
   ck_assert_msg(9999, "This test should pass");
@@ -59,7 +59,7 @@ END_TEST
 
 START_TEST(test_fail_unless)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   fail_unless(1 == 2, "This test should fail");
@@ -68,7 +68,7 @@ END_TEST
 
 START_TEST(test_fail_if_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   fail_if(1 == 2, "This test should pass");
   fail_if(0, "This test should pass");
@@ -77,7 +77,7 @@ END_TEST
 
 START_TEST(test_fail_if_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   fail_if(1 == 1, "This test should fail");
@@ -86,7 +86,7 @@ END_TEST
 
 START_TEST(test_fail_null_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   fail_unless(2 == 3, NULL);
@@ -96,7 +96,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_no_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   /* taking out the NULL provokes an ISO C99 warning in GCC */
   record_failure_line_num(__LINE__);
@@ -106,7 +106,7 @@ END_TEST
 #endif /* __GNUC__ */
 START_TEST(test_fail_if_null_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   fail_if(2 != 3, NULL);
@@ -116,7 +116,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_if_no_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   /* taking out the NULL provokes an ISO C99 warning in GCC */
   record_failure_line_num(__LINE__);
@@ -129,7 +129,7 @@ START_TEST(test_fail_vararg_msg_1)
   int x = 3;
   int y = 4;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   fail_unless(x == y, "%d != %d", x, y);
@@ -141,7 +141,7 @@ START_TEST(test_fail_vararg_msg_2)
   int x = 5;
   int y = 6;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   fail_if(x != y, "%d != %d", x, y);
@@ -153,7 +153,7 @@ START_TEST(test_fail_vararg_msg_3)
   int x = 7;
   int y = 7;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   fail("%d == %d", x, y);
@@ -163,7 +163,7 @@ END_TEST
 #if defined(__GNUC__)
 START_TEST(test_fail_empty)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   /* plain fail() doesn't compile with xlc in C mode because of `, ## __VA_ARGS__' problem */
   /* on the other hand, taking out the NULL provokes an ISO C99 warning in GCC */
@@ -175,7 +175,7 @@ END_TEST
 
 START_TEST(test_ck_abort)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_abort();
@@ -184,7 +184,7 @@ END_TEST
 
 START_TEST(test_ck_abort_msg)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_abort_msg("Failure expected");
@@ -194,7 +194,7 @@ END_TEST
 /* FIXME: perhaps passing NULL to ck_abort_msg should be an error. */
 START_TEST(test_ck_abort_msg_null)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_abort_msg(NULL);
@@ -209,7 +209,7 @@ START_TEST(test_ck_assert)
   int x = 3;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert(1);
   ck_assert(x == y);
@@ -222,7 +222,7 @@ END_TEST
 
 START_TEST(test_ck_assert_null)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert(0);
@@ -233,7 +233,7 @@ START_TEST(test_ck_assert_with_mod)
 {
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert(1%f == 1);
@@ -245,7 +245,7 @@ START_TEST(test_ck_assert_int_eq)
   int x = 3;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_int_eq(x, y);
   y++;
@@ -259,7 +259,7 @@ START_TEST(test_ck_assert_int_eq_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_eq(3%d, 2%f);
@@ -271,7 +271,7 @@ START_TEST(test_ck_assert_int_ne)
   int x = 3;
   int y = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_int_ne(x, y);
   y++;
@@ -285,7 +285,7 @@ START_TEST(test_ck_assert_int_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_ne(3%d, 3%f);
@@ -297,7 +297,7 @@ START_TEST(test_ck_assert_int_lt)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_int_lt(x, y);
   record_failure_line_num(__LINE__);
@@ -310,7 +310,7 @@ START_TEST(test_ck_assert_int_lt_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_lt(3%d, 3%f);
@@ -322,7 +322,7 @@ START_TEST(test_ck_assert_int_le)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_int_le(x, y);
   ck_assert_int_le(x, x);
@@ -336,7 +336,7 @@ START_TEST(test_ck_assert_int_le_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_le(3%d, 2%f);
@@ -348,7 +348,7 @@ START_TEST(test_ck_assert_int_gt)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_int_gt(y, x);
   record_failure_line_num(__LINE__);
@@ -361,7 +361,7 @@ START_TEST(test_ck_assert_int_gt_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_gt(3%d, 3%f);
@@ -373,7 +373,7 @@ START_TEST(test_ck_assert_int_ge)
   int x = 2;
   int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_int_ge(y, x);
   ck_assert_int_ge(y, x);
@@ -387,7 +387,7 @@ START_TEST(test_ck_assert_int_ge_with_mod)
   int d = 1;
   int f = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_int_ge(3%d, 4%f);
@@ -399,7 +399,7 @@ START_TEST(test_ck_assert_int_expr)
   int x = 1;
   int y = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_int_eq(x, ++y);
   ck_assert_int_eq(x, y);
@@ -410,7 +410,7 @@ START_TEST(test_ck_assert_uint_eq)
   unsigned int x = 3;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_uint_eq(x, y);
   y++;
@@ -424,7 +424,7 @@ START_TEST(test_ck_assert_uint_eq_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_eq(3%d, 1%f);
@@ -436,7 +436,7 @@ START_TEST(test_ck_assert_uint_ne)
   unsigned int x = 3;
   unsigned int y = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_uint_ne(x, y);
   y++;
@@ -450,7 +450,7 @@ START_TEST(test_ck_assert_uint_ne_with_mod)
   int d = 1;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_ne(1%d, 1%f);
@@ -462,7 +462,7 @@ START_TEST(test_ck_assert_uint_lt)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_uint_lt(x, y);
   record_failure_line_num(__LINE__);
@@ -475,7 +475,7 @@ START_TEST(test_ck_assert_uint_lt_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_lt(3%d, 1%f);
@@ -487,7 +487,7 @@ START_TEST(test_ck_assert_uint_le)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_uint_le(x, y);
   ck_assert_uint_le(x, x);
@@ -501,7 +501,7 @@ START_TEST(test_ck_assert_uint_le_with_mod)
   int d = 2;
   int f = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_le(3%d, 1%f);
@@ -513,7 +513,7 @@ START_TEST(test_ck_assert_uint_gt)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_uint_gt(y, x);
   record_failure_line_num(__LINE__);
@@ -526,7 +526,7 @@ START_TEST(test_ck_assert_uint_gt_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_gt(1%d, 3%f);
@@ -538,7 +538,7 @@ START_TEST(test_ck_assert_uint_ge)
   unsigned int x = 2;
   unsigned int y = 3;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_uint_ge(y, x);
   ck_assert_uint_ge(y, x);
@@ -552,7 +552,7 @@ START_TEST(test_ck_assert_uint_ge_with_mod)
   int d = 1;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_uint_ge(1%d, 3%f);
@@ -564,7 +564,7 @@ START_TEST(test_ck_assert_uint_expr)
   unsigned int x = 1;
   unsigned int y = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_uint_eq(x, ++y);
   ck_assert_uint_eq(x, y);
@@ -575,7 +575,7 @@ START_TEST(test_ck_assert_float_eq)
   float x = 1.1f;
   float y = 1.1f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_eq(x, y);
   y+=0.1f;
@@ -589,7 +589,7 @@ START_TEST(test_ck_assert_float_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_eq(3%d, 2%f);
@@ -601,7 +601,7 @@ START_TEST(test_ck_assert_float_ne)
   float x = 1.1f;
   float y = 1.2f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_ne(x, y);
   y = x;
@@ -615,7 +615,7 @@ START_TEST(test_ck_assert_float_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ne(1%d, 1%f);
@@ -627,7 +627,7 @@ START_TEST(test_ck_assert_float_lt)
   float x = 2.0f;
   float y = 2.5f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_lt(x, y);
   y-=1.0f;
@@ -641,7 +641,7 @@ START_TEST(test_ck_assert_float_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_lt(3%d, 2%f);
@@ -653,7 +653,7 @@ START_TEST(test_ck_assert_float_le)
   float x = 2.0f;
   float y = 2.5f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_le(x, y);
   ck_assert_float_le(x, x);
@@ -668,7 +668,7 @@ START_TEST(test_ck_assert_float_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_le(3%d, 2%f);
@@ -680,7 +680,7 @@ START_TEST(test_ck_assert_float_gt)
   float x = 2.5f;
   float y = 2.0f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_gt(x, y);
   y+=1.0f;
@@ -694,7 +694,7 @@ START_TEST(test_ck_assert_float_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_gt(2%d, 3%f);
@@ -706,7 +706,7 @@ START_TEST(test_ck_assert_float_ge)
   float x = 2.5f;
   float y = 2.0f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_ge(x, y);
   ck_assert_float_ge(x, x);
@@ -721,7 +721,7 @@ START_TEST(test_ck_assert_float_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ge(2%d, 3%f);
@@ -734,7 +734,7 @@ START_TEST(test_ck_assert_float_with_expr)
   float y = 1.1f;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   i = 1;
   ck_assert_float_eq(x[i++], y);
@@ -770,7 +770,7 @@ START_TEST(test_ck_assert_float_eq_tol)
   float y = 0.0003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_eq_tol(x, y, t);
   ck_assert_float_eq_tol(x, x, t);
@@ -790,7 +790,7 @@ START_TEST(test_ck_assert_float_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_eq_tol(3%d, 2%f, 2%p);
@@ -803,7 +803,7 @@ START_TEST(test_ck_assert_float_ne_tol)
   float y = 0.0002f;
   float t = 0.0001f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_ne_tol(x, y, t);
   x*=10.0f;
@@ -822,7 +822,7 @@ START_TEST(test_ck_assert_float_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ne_tol(3%d, 3%f, 3%p);
@@ -835,7 +835,7 @@ START_TEST(test_ck_assert_float_ge_tol)
   float y = 0.003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_ge_tol(y, x, t);
   ck_assert_float_ge_tol(x, x, t);
@@ -857,7 +857,7 @@ START_TEST(test_ck_assert_float_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_ge_tol(2%d, 3%f, 3%p);
@@ -870,7 +870,7 @@ START_TEST(test_ck_assert_float_le_tol)
   float y = 0.003f;
   float t = 0.001f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_le_tol(x, y, t);
   ck_assert_float_le_tol(x, x, t);
@@ -892,7 +892,7 @@ START_TEST(test_ck_assert_float_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_le_tol(3%d, 2%f, 3%p);
@@ -906,7 +906,7 @@ START_TEST(test_ck_assert_float_tol_with_expr)
   float t = 0.01f;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   i = 1;
   ck_assert_float_eq_tol(x[i++], y, t);
@@ -933,7 +933,7 @@ START_TEST(test_ck_assert_float_finite)
   float x = 0.0001f;
   float t = 1.0f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -949,7 +949,7 @@ START_TEST(test_ck_assert_float_finite_with_mod)
   float t = 1.0f;
   float x = 1.0f / (1.0f - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_finite(x*(1%d));
@@ -961,7 +961,7 @@ START_TEST(test_ck_assert_float_infinite)
   float t = 1.0f;
   float x = 1.0f / (1.0f - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_infinite(x);
   x = -1.0f / (1.0f - t);
@@ -976,7 +976,7 @@ START_TEST(test_ck_assert_float_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_infinite(2%d);
@@ -988,7 +988,7 @@ START_TEST(test_ck_assert_float_nan)
   float t = 1.0f;
   float x = 0.0f / (1.0f - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_nan(x);
   x = 1.0f / (1.0f - t);
@@ -1001,7 +1001,7 @@ START_TEST(test_ck_assert_float_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_float_nan(2%d);
@@ -1013,7 +1013,7 @@ START_TEST(test_ck_assert_float_nonnan)
   float x = 0.0f;
   float t = 1.0f;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_nonnan(x);
 #if ENABLE_REGEX
@@ -1032,7 +1032,7 @@ START_TEST(test_ck_assert_float_nonnan_with_mod)
   float t = 1.0f;
   float x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_nonnan(2%s);
 #if ENABLE_REGEX
@@ -1051,7 +1051,7 @@ START_TEST(test_ck_assert_float_nan_and_inf_with_expr)
   float x[] = {0.0f, 0.0f, INFINITY, INFINITY, NAN, NAN, 0.0f, 0.0f, NAN};
   int i = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_float_finite(x[i++]);
   ck_assert_float_finite(x[i++]);
@@ -1069,7 +1069,7 @@ START_TEST(test_ck_assert_double_eq)
   double x = 1.1;
   double y = 1.1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_eq(x, y);
   y+=0.1;
@@ -1083,7 +1083,7 @@ START_TEST(test_ck_assert_double_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq(3%d, 2%f);
@@ -1095,7 +1095,7 @@ START_TEST(test_ck_assert_double_eq_with_promotion)
   float x = 0.1F;
   double y = x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_eq(x, y);
 }
@@ -1105,7 +1105,7 @@ START_TEST(test_ck_assert_double_eq_with_conv)
 {
   float x = 0.1F;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq(x, 0.1);
@@ -1117,7 +1117,7 @@ START_TEST(test_ck_assert_double_ne)
   double x = 1.1;
   double y = 1.2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_ne(x, y);
   y = x;
@@ -1131,7 +1131,7 @@ START_TEST(test_ck_assert_double_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ne(1%d, 1%f);
@@ -1143,7 +1143,7 @@ START_TEST(test_ck_assert_double_lt)
   double x = 2.0;
   double y = 2.5;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_lt(x, y);
   y-=1;
@@ -1157,7 +1157,7 @@ START_TEST(test_ck_assert_double_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_lt(3%d, 2%f);
@@ -1169,7 +1169,7 @@ START_TEST(test_ck_assert_double_le)
   double x = 2.0;
   double y = 2.5;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_le(x, y);
   ck_assert_double_le(x, x);
@@ -1184,7 +1184,7 @@ START_TEST(test_ck_assert_double_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_le(3%d, 2%f);
@@ -1196,7 +1196,7 @@ START_TEST(test_ck_assert_double_gt)
   double x = 2.5;
   double y = 2.0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_gt(x, y);
   y+=1;
@@ -1210,7 +1210,7 @@ START_TEST(test_ck_assert_double_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_gt(2%d, 3%f);
@@ -1222,7 +1222,7 @@ START_TEST(test_ck_assert_double_ge)
   double x = 2.5;
   double y = 2.0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_ge(x, y);
   ck_assert_double_ge(x, x);
@@ -1237,7 +1237,7 @@ START_TEST(test_ck_assert_double_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ge(2%d, 3%f);
@@ -1250,7 +1250,7 @@ START_TEST(test_ck_assert_double_with_expr)
   double y = 1.1;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   i = 1;
   ck_assert_double_eq(x[i++], y);
@@ -1286,7 +1286,7 @@ START_TEST(test_ck_assert_double_eq_tol)
   double y = 0.0002;
   double t = 0.001;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_eq_tol(x, y, t);
   ck_assert_double_eq_tol(x, x, t);
@@ -1306,7 +1306,7 @@ START_TEST(test_ck_assert_double_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_eq_tol(3%d, 2%f, 2%p);
@@ -1319,7 +1319,7 @@ START_TEST(test_ck_assert_double_ne_tol)
   double y = 0.0002;
   double t = 0.0001;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_ne_tol(x, y, t);
   x*=10;
@@ -1338,7 +1338,7 @@ START_TEST(test_ck_assert_double_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ne_tol(3%d, 3%f, 3%p);
@@ -1351,7 +1351,7 @@ START_TEST(test_ck_assert_double_ge_tol)
   double y = 0.003;
   double t = 0.001;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_ge_tol(y, x, t);
   ck_assert_double_ge_tol(x, x, t);
@@ -1373,7 +1373,7 @@ START_TEST(test_ck_assert_double_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_ge_tol(2%d, 3%f, 3%p);
@@ -1386,7 +1386,7 @@ START_TEST(test_ck_assert_double_le_tol)
   double y = 0.003;
   double t = 0.001;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_le_tol(x, y, t);
   ck_assert_double_le_tol(x, x, t);
@@ -1408,7 +1408,7 @@ START_TEST(test_ck_assert_double_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_le_tol(3%d, 2%f, 3%p);
@@ -1422,7 +1422,7 @@ START_TEST(test_ck_assert_double_tol_with_expr)
   double t = 0.01;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   i = 1;
   ck_assert_double_eq_tol(x[i++], y, t);
@@ -1449,7 +1449,7 @@ START_TEST(test_ck_assert_double_finite)
   double x = 0.0001;
   double t = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -1465,7 +1465,7 @@ START_TEST(test_ck_assert_double_finite_with_mod)
   double t = 1;
   double x = 1.0 / (1.0 - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_finite(x*(1%d));
@@ -1477,7 +1477,7 @@ START_TEST(test_ck_assert_double_infinite)
   double t = 1;
   double x = 1.0 / (1.0 - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_infinite(x);
   x = -1.0 / (1.0 - t);
@@ -1492,7 +1492,7 @@ START_TEST(test_ck_assert_double_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_infinite(2%d);
@@ -1504,7 +1504,7 @@ START_TEST(test_ck_assert_double_nan)
   double t = 1;
   double x = 0.0 / (1.0 - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_nan(x);
   x = 1.0 / (1.0 - t);
@@ -1517,7 +1517,7 @@ START_TEST(test_ck_assert_double_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_double_nan(2%d);
@@ -1529,7 +1529,7 @@ START_TEST(test_ck_assert_double_nonnan)
   double x = 0;
   double t = 1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_nonnan(x);
 #if ENABLE_REGEX
@@ -1548,7 +1548,7 @@ START_TEST(test_ck_assert_double_nonnan_with_mod)
   double t = 1.0;
   double x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_nonnan(2%s);
 #if ENABLE_REGEX
@@ -1567,7 +1567,7 @@ START_TEST(test_ck_assert_double_nan_and_inf_with_expr)
   double x[] = {0.0, 0.0, INFINITY, INFINITY, NAN, NAN, 0.0, 0.0, NAN};
   int i = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_double_finite(x[i++]);
   ck_assert_double_finite(x[i++]);
@@ -1585,7 +1585,7 @@ START_TEST(test_ck_assert_ldouble_eq)
   long double x = 1.1l;
   long double y = 1.1l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_eq(x, y);
   y+=0.1l;
@@ -1599,7 +1599,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_eq(3%d, 2%f);
@@ -1611,7 +1611,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_promotion)
   float x = 1.1F;
   long double y = x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_eq(x, y);
 }
@@ -1622,7 +1622,7 @@ START_TEST(test_ck_assert_ldouble_eq_with_conv)
   float x = 1.1F;
   long double y = x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_eq(x, y);
   record_failure_line_num(__LINE__);
@@ -1635,7 +1635,7 @@ START_TEST(test_ck_assert_ldouble_ne)
   long double x = 1.1l;
   long double y = 1.2l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_ne(x, y);
   y = x;
@@ -1649,7 +1649,7 @@ START_TEST(test_ck_assert_ldouble_ne_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ne(1%d, 1%f);
@@ -1661,7 +1661,7 @@ START_TEST(test_ck_assert_ldouble_lt)
   long double x = 2.0l;
   long double y = 2.5l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_lt(x, y);
   y-=1.0l;
@@ -1675,7 +1675,7 @@ START_TEST(test_ck_assert_ldouble_lt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_lt(3%d, 2%f);
@@ -1687,7 +1687,7 @@ START_TEST(test_ck_assert_ldouble_le)
   long double x = 2.0l;
   long double y = 2.5l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_le(x, y);
   ck_assert_ldouble_le(x, x);
@@ -1702,7 +1702,7 @@ START_TEST(test_ck_assert_ldouble_le_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_le(3%d, 2%f);
@@ -1714,7 +1714,7 @@ START_TEST(test_ck_assert_ldouble_gt)
   long double x = 2.5l;
   long double y = 2.0l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_gt(x, y);
   y+=1.0l;
@@ -1728,7 +1728,7 @@ START_TEST(test_ck_assert_ldouble_gt_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_gt(2%d, 3%f);
@@ -1740,7 +1740,7 @@ START_TEST(test_ck_assert_ldouble_ge)
   long double x = 2.5l;
   long double y = 2.0l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_ge(x, y);
   ck_assert_ldouble_ge(x, x);
@@ -1755,7 +1755,7 @@ START_TEST(test_ck_assert_ldouble_ge_with_mod)
   int d = 2;
   int f = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ge(2%d, 3%f);
@@ -1768,7 +1768,7 @@ START_TEST(test_ck_assert_ldouble_with_expr)
   long double y = 1.1l;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   i = 1;
   ck_assert_ldouble_eq(x[i++], y);
@@ -1804,7 +1804,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol)
   long double y = 0.0002l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_eq_tol(x, y, t);
   ck_assert_ldouble_eq_tol(x, x, t);
@@ -1824,7 +1824,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_eq_tol(3%d, 2%f, 2%p);
@@ -1837,7 +1837,7 @@ START_TEST(test_ck_assert_ldouble_ne_tol)
   long double y = 0.0002l;
   long double t = 0.0001l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_ne_tol(x, y, t);
   x*=10.0l;
@@ -1856,7 +1856,7 @@ START_TEST(test_ck_assert_ldouble_ne_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ne_tol(3%d, 3%f, 3%p);
@@ -1869,7 +1869,7 @@ START_TEST(test_ck_assert_ldouble_ge_tol)
   long double y = 0.003l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_ge_tol(y, x, t);
   ck_assert_ldouble_ge_tol(x, x, t);
@@ -1891,7 +1891,7 @@ START_TEST(test_ck_assert_ldouble_ge_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_ge_tol(2%d, 3%f, 3%p);
@@ -1904,7 +1904,7 @@ START_TEST(test_ck_assert_ldouble_le_tol)
   long double y = 0.003l;
   long double t = 0.001l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_le_tol(x, y, t);
   ck_assert_ldouble_le_tol(x, x, t);
@@ -1926,7 +1926,7 @@ START_TEST(test_ck_assert_ldouble_le_tol_with_mod)
   int f = 2;
   int p = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_le_tol(3%d, 2%f, 3%p);
@@ -1940,7 +1940,7 @@ START_TEST(test_ck_assert_ldouble_tol_with_expr)
   long double t = 0.01l;
   int i;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   i = 1;
   ck_assert_ldouble_eq_tol(x[i++], y, t);
@@ -1967,7 +1967,7 @@ START_TEST(test_ck_assert_ldouble_finite)
   long double x = 0.0001l;
   long double t = 1.0l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_finite(x);
   /* MS VS doesn't allow explicit division by zero */
@@ -1983,7 +1983,7 @@ START_TEST(test_ck_assert_ldouble_finite_with_mod)
   long double t = 1.0l;
   long double x = 1.0l / (1.0l - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_finite(x*(1%d));
@@ -1995,7 +1995,7 @@ START_TEST(test_ck_assert_ldouble_infinite)
   long double t = 1.0l;
   long double x = 1.0l / (1.0l - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_infinite(x);
   x = -1.0l / (1.0l - t);
@@ -2010,7 +2010,7 @@ START_TEST(test_ck_assert_ldouble_infinite_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_infinite(2%d);
@@ -2022,7 +2022,7 @@ START_TEST(test_ck_assert_ldouble_nan)
   long double t = 1.0l;
   long double x = 0.0l / (1.0l - t);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_nan(x);
   x = 1.0l / (1.0l - t);
@@ -2035,7 +2035,7 @@ START_TEST(test_ck_assert_ldouble_nan_with_mod)
 {
   int d = 2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_ldouble_nan(2%d);
@@ -2047,7 +2047,7 @@ START_TEST(test_ck_assert_ldouble_nonnan)
   long double x = 0.0l;
   long double t = 1.0l;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_nonnan(x);
 #if ENABLE_REGEX
@@ -2066,7 +2066,7 @@ START_TEST(test_ck_assert_ldouble_nonnan_with_mod)
   long double t = 1.0l;
   long double x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_nonnan(2%s);
 #if ENABLE_REGEX
@@ -2085,7 +2085,7 @@ START_TEST(test_ck_assert_ldouble_nan_and_inf_with_expr)
   long double x[] = {0.0l, 0.0l, INFINITY, INFINITY, NAN, NAN, 0.0l, 0.0l, NAN};
   int i = 0;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ldouble_finite(x[i++]);
   ck_assert_ldouble_finite(x[i++]);
@@ -2107,7 +2107,7 @@ int returnsZero(const char* argument)
 
 START_TEST(test_percent_n_escaped)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   /* If the %n is not escaped in the ck macro, then this results in a SEGFAULT */
   record_failure_line_num(__LINE__);
@@ -2118,7 +2118,7 @@ START_TEST(test_ck_assert_str_eq)
 {
   const char *s = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_str_eq("test2", s);
   record_failure_line_num(__LINE__);
@@ -2131,7 +2131,7 @@ START_TEST(test_ck_assert_str_eq_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_eq(t, s);
@@ -2143,7 +2143,7 @@ START_TEST(test_ck_assert_str_ne)
   const char *s = "test2";
   const char *t = "test1";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_str_ne(t, s);
   t = "test2";
@@ -2157,7 +2157,7 @@ START_TEST(test_ck_assert_str_ne_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_ne(t, s);
@@ -2169,7 +2169,7 @@ START_TEST(test_ck_assert_str_lt)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_str_lt(s, t);
   record_failure_line_num(__LINE__);
@@ -2182,7 +2182,7 @@ START_TEST(test_ck_assert_str_lt_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_lt(s, t);
@@ -2194,7 +2194,7 @@ START_TEST(test_ck_assert_str_le)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_str_le(s, t);
   ck_assert_str_le(s, s);
@@ -2208,7 +2208,7 @@ START_TEST(test_ck_assert_str_le_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_le(t, s);
@@ -2220,7 +2220,7 @@ START_TEST(test_ck_assert_str_gt)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_str_gt(t, s);
   record_failure_line_num(__LINE__);
@@ -2233,7 +2233,7 @@ START_TEST(test_ck_assert_str_gt_with_null)
   const char *s = NULL;
   const char *t = "test";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_gt(t, s);
@@ -2245,7 +2245,7 @@ START_TEST(test_ck_assert_str_ge)
   const char *s = "test1";
   const char *t = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_str_ge(t, s);
   ck_assert_str_ge(t, t);
@@ -2259,7 +2259,7 @@ START_TEST(test_ck_assert_str_ge_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_str_ge(s, t);
@@ -2272,7 +2272,7 @@ START_TEST(test_ck_assert_str_expr)
   const char *t[] = { "test1", "test2" };
   int i = -1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_str_eq(s, t[++i]);
   ck_assert_str_eq(s, t[i]);
@@ -2283,7 +2283,7 @@ START_TEST(test_ck_assert_pstr_eq)
 {
   const char *s = "test";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_pstr_eq("test", s);
   ck_assert_pstr_eq(NULL, NULL);
@@ -2297,7 +2297,7 @@ START_TEST(test_ck_assert_pstr_eq_with_null)
   const char *t = "test";
   const char *s = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_pstr_eq(t, s);
@@ -2309,7 +2309,7 @@ START_TEST(test_ck_assert_pstr_ne)
   const char *t = "test1";
   const char *s = "test2";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_pstr_ne(t, s);
   ck_assert_pstr_ne(t, NULL);
@@ -2324,7 +2324,7 @@ START_TEST(test_ck_assert_pstr_ne_with_null)
   const char *s = NULL;
   const char *t = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_pstr_ne(t, s);
@@ -2336,7 +2336,7 @@ START_TEST(test_ck_assert_ptr_eq)
   int * x = (int*)0x1;
   int * y = (int*)0x2;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ptr_eq(NULL, NULL);
   ck_assert_ptr_eq(x,    x);
@@ -2351,7 +2351,7 @@ START_TEST(test_ck_assert_ptr_ne)
   int * y = (int*)0x2;
   int * z = x;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ptr_ne(x,    y);
   ck_assert_ptr_ne(x,    NULL);
@@ -2366,7 +2366,7 @@ START_TEST(test_ck_assert_ptr_null)
   void* x = (void*)0x1;
   void* y = NULL;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ptr_null(y);
   record_failure_line_num(__LINE__);
@@ -2379,7 +2379,7 @@ START_TEST(test_ck_assert_ptr_nonnull)
   void* x = NULL;
   void* y = (void*)0x1;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_ptr_nonnull(y);
   record_failure_line_num(__LINE__);
@@ -2391,7 +2391,7 @@ START_TEST(test_ck_assert_mem_eq)
 {
   const char *s = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_mem_eq("\x00\x00\x00\x00\x02", s, 5);
   record_failure_line_num(__LINE__);
@@ -2404,7 +2404,7 @@ START_TEST(test_ck_assert_mem_ne)
   const char *s = "\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_mem_ne(t, s, 5);
   t = "\x00\x00\x00\x00\x02";
@@ -2418,7 +2418,7 @@ START_TEST(test_ck_assert_mem_lt)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_mem_lt(s, t, 5);
   record_failure_line_num(__LINE__);
@@ -2431,7 +2431,7 @@ START_TEST(test_ck_assert_mem_le)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_mem_le(s, t, 5);
   ck_assert_mem_le(s, s, 5);
@@ -2445,7 +2445,7 @@ START_TEST(test_ck_assert_mem_gt)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_mem_gt(t, s, 5);
   record_failure_line_num(__LINE__);
@@ -2458,7 +2458,7 @@ START_TEST(test_ck_assert_mem_ge)
   const char *s = "\x00\x00\x00\x00\x01";
   const char *t = "\x00\x00\x00\x00\x02";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_mem_ge(t, s, 5);
   ck_assert_mem_ge(t, t, 5);
@@ -2472,7 +2472,7 @@ START_TEST(test_ck_assert_mem_zerolen)
   const char *s = "\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   ck_assert_mem_eq(t, s, 0);
 }
@@ -2483,7 +2483,7 @@ START_TEST(test_ck_assert_mem_eq_exact)
   const char *s = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_mem_eq(t, s, 64);
@@ -2495,7 +2495,7 @@ START_TEST(test_ck_assert_mem_eq_longer)
   const char *s = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02";
   const char *t = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   record_failure_line_num(__LINE__);
   ck_assert_mem_eq(t, s, 65);
@@ -2505,7 +2505,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK == 1
 START_TEST(test_segv_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   /*
    * This test is to be used when it would otherwise not cause a
    * failure. e.g., shen SIGSEGV is expected.
@@ -2516,7 +2516,7 @@ END_TEST
 
 START_TEST(test_segv)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   raise (SIGSEGV);
 }
@@ -2529,7 +2529,7 @@ END_TEST
 #if !defined(__CYGWIN__)
 START_TEST(test_fpe)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   raise (SIGFPE);
 }
@@ -2542,7 +2542,7 @@ END_TEST
  */
 START_TEST(test_non_signal_8)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   exit(0);
 }
@@ -2559,7 +2559,7 @@ END_TEST
 START_TEST(test_mark_point)
 {
   int i;
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   i = 0;
   i++;
   mark_point();
@@ -2575,7 +2575,7 @@ END_TEST
 #if TIMEOUT_TESTS_ENABLED && defined(HAVE_FORK) && HAVE_FORK == 1
 START_TEST(test_eternal_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   for (;;)
     sleep(1);
@@ -2589,21 +2589,21 @@ END_TEST
 #ifdef HAVE_LIBRT
 START_TEST(test_sleep0_025_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   usleep(25*1000);
 }
 END_TEST
 
 START_TEST(test_sleep1_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   sleep(1);
 }
 END_TEST
 
 START_TEST(test_sleep1_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(1);
 }
@@ -2612,14 +2612,14 @@ END_TEST
 
 START_TEST(test_sleep2_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   sleep(2);
 }
 END_TEST
 
 START_TEST(test_sleep2_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(2);
 }
@@ -2627,14 +2627,14 @@ END_TEST
 
 START_TEST(test_sleep5_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   sleep(5);
 }
 END_TEST
 
 START_TEST(test_sleep5_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(5);
 }
@@ -2642,14 +2642,14 @@ END_TEST
 
 START_TEST(test_sleep9_pass)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   sleep(9);
 }
 END_TEST
 
 START_TEST(test_sleep9_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(9);
 }
@@ -2657,7 +2657,7 @@ END_TEST
 
 START_TEST(test_sleep14_fail)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   sleep(14);
   exit(3);
@@ -2668,7 +2668,7 @@ END_TEST
 #if defined(HAVE_FORK) && HAVE_FORK==1
 START_TEST(test_early_exit)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__-4); /* -4 as the failure is reported at START_TEST() */
   exit(EXIT_FAILURE);
 }
@@ -2687,7 +2687,7 @@ START_TEST(test_null)
   Suite *s;
   TCase *tc;
   
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   s = suite_create(NULL);
   tc = tcase_create(NULL);
@@ -2706,7 +2706,7 @@ START_TEST(test_null_2)
 {
   SRunner *sr = srunner_create(NULL);
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   srunner_run_all (sr, CK_NORMAL);
   srunner_free (sr);
@@ -2721,7 +2721,7 @@ START_TEST(test_fork1p_pass)
 {
   pid_t pid;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   if((pid = fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2740,7 +2740,7 @@ START_TEST(test_fork1p_fail)
 {
   pid_t pid;
   
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   if((pid = fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2760,7 +2760,7 @@ START_TEST(test_fork1c_pass)
 {
   pid_t pid;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2777,7 +2777,7 @@ START_TEST(test_fork1c_fail)
 {
   pid_t pid;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2795,7 +2795,7 @@ START_TEST(test_fork2_pass)
   pid_t pid;
   pid_t pid2;
   
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2817,7 +2817,7 @@ START_TEST(test_fork2_fail)
   pid_t pid;
   pid_t pid2;
   
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   if((pid = check_fork()) < 0) {
     ck_abort_msg("Failed to fork new process");
@@ -2845,7 +2845,7 @@ START_TEST(test_invalid_set_fork_status)
    TCase *tc1;
    SRunner *sr;
 
-   record_test_name(tcase_name());
+   record_test_name(tcase_current_name());
 
    record_failure_line_num(__LINE__-9); /* -9 as the failure is reported at START_TEST() */
    s1 = suite_create ("suite1");
@@ -2864,7 +2864,7 @@ START_TEST(test_srunner)
   Suite *s;
   SRunner *sr;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   s = suite_create("Check Servant3");
   ck_assert_msg(s != NULL, NULL);
@@ -2888,7 +2888,7 @@ END_TEST
 
 START_TEST(test_2nd_suite)
 {
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
   record_failure_line_num(__LINE__);
   ck_abort_msg("We failed");
 }
@@ -2920,7 +2920,7 @@ START_TEST(test_ignore_exit_handlers)
 {
   int result;
 
-  record_test_name(tcase_name());
+  record_test_name(tcase_current_name());
 
   result = atexit(exit_handler);
   if(result != 0)

From 28d0c7c56028729db31d0a0b4c2eb713be7018e9 Mon Sep 17 00:00:00 2001
From: Chris Hanson <cmhanson@eschatologist.net>
Date: Fri, 3 Jul 2026 22:34:23 -0700
Subject: [PATCH 13/13] Change tcase_fn_start() to _tcase_fn_start()

Since it's an exposed internal function, `tcase_fn_start()` should be
`_tcase_fn_start()` instead.
---
 src/check.c     | 4 ++--
 src/check.h.in  | 4 ++--
 src/check_run.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/check.c b/src/check.c
index 55f5e7fa..0334234c 100644
--- a/src/check.c
+++ b/src/check.c
@@ -384,8 +384,8 @@ void tcase_set_timeout(TCase * tc, double timeout)
 #endif /* HAVE_FORK */
 }
 
-void tcase_fn_start(const char *fname, const char *file,
-                    int line)
+void _tcase_fn_start(const char *fname, const char *file,
+                     int line)
 {
     send_ctx_info(CK_CTX_TEST);
     send_loc_info(file, line);
diff --git a/src/check.h.in b/src/check.h.in
index b39e2d76..b177c1d3 100644
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -514,8 +514,8 @@ CK_DLL_EXP void CK_EXPORT tcase_add_checked_fixture(TCase * tc, SFun setup,
 CK_DLL_EXP void CK_EXPORT tcase_set_timeout(TCase * tc, double timeout);
 
 /* Internal function to mark the start of a test function */
-CK_DLL_EXP void CK_EXPORT tcase_fn_start(const char *fname, const char *file,
-                                         int line);
+CK_DLL_EXP void CK_EXPORT _tcase_fn_start(const char *fname, const char *file,
+                                          int line);
 
 /**
  * Retreive the name of the current running test. This is the name
diff --git a/src/check_run.c b/src/check_run.c
index 5f160e50..7c9a7295 100644
--- a/src/check_run.c
+++ b/src/check_run.c
@@ -416,7 +416,7 @@ static TestResult *tcase_run_tfun_nofork(SRunner * sr, TCase * tc, TF * tfun,
         clock_gettime(check_get_clockid(), &ts_start);
         if(0 == setjmp(error_jmp_buffer))
         {
-            tcase_fn_start(tfun->ttest->name, tfun->ttest->file, tfun->ttest->line);
+            _tcase_fn_start(tfun->ttest->name, tfun->ttest->file, tfun->ttest->line);
             tfun->ttest->fn(i);
         }
         clock_gettime(check_get_clockid(), &ts_end);
@@ -493,7 +493,7 @@ static TestResult *tcase_run_tfun_fork(SRunner * sr, TCase * tc, TF * tfun,
         tr = tcase_run_checked_setup(sr, tc);
         free(tr);
         clock_gettime(check_get_clockid(), &ts_start);
-        tcase_fn_start(tfun->ttest->name, tfun->ttest->file, tfun->ttest->line);
+        _tcase_fn_start(tfun->ttest->name, tfun->ttest->file, tfun->ttest->line);
         tfun->ttest->fn(i);
         clock_gettime(check_get_clockid(), &ts_end);
         tcase_run_checked_teardown(tc);