1 files changed, 4 insertions, 13 deletions
diff --git a/atf-c/detail/test_helpers.h b/atf-c/detail/test_helpers.h
index 5df034fb42ad..3037ba4189c8 100644
--- a/atf-c/detail/test_helpers.h
+++ b/atf-c/detail/test_helpers.h
@@ -63,21 +63,12 @@ struct atf_fs_path;
     } \
     ATF_TC_BODY(name, tc) \
     { \
-        build_check_c_o(tc, sfile, failmsg, true);   \
+        if (!build_check_c_o_srcdir(tc, sfile)) \
+            atf_tc_fail("%s", failmsg); \
     }
 
-#define BUILD_TC_FAIL(name, sfile, descr, failmsg) \
-    ATF_TC(name); \
-    ATF_TC_HEAD(name, tc) \
-    { \
-        atf_tc_set_md_var(tc, "descr", descr); \
-    } \
-    ATF_TC_BODY(name, tc) \
-    { \
-        build_check_c_o(tc, sfile, failmsg, false);   \
-    }
-
-void build_check_c_o(const atf_tc_t *, const char *, const char *, const bool);
+bool build_check_c_o(const char *);
+bool build_check_c_o_srcdir(const atf_tc_t *, const char *);
 void header_check(const char *);
 void get_process_helpers_path(const atf_tc_t *, const bool,
                               struct atf_fs_path *);