[Issue #46] Fixed wrong setjmp usage

Snaipe · Sep 19, 2015 · 4e5d416 · 4e5d416
1 parent d75eb4f
commit 4e5d416
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/src/abort.c b/src/abort.c
@@ -25,10 +25,6 @@
 
 jmp_buf g_pre_test;
 
-int setup_abort_test(void) {
-    return !setjmp(g_pre_test);
-}
-
 void criterion_abort_test(void) {
     longjmp(g_pre_test, 1);
 }
diff --git a/src/abort.h b/src/abort.h
@@ -29,6 +29,4 @@
 
 extern jmp_buf g_pre_test;
 
-int setup_abort_test(void);
-
 #endif /* !ABORT_H_ */
diff --git a/src/runner.c b/src/runner.c
@@ -184,7 +184,7 @@ static void run_test_child(struct criterion_test *test,
     send_event(PRE_TEST, NULL, 0);
 
     struct timespec_compat ts;
-    if (setup_abort_test()) {
+    if (!setjmp(g_pre_test)) {
         timer_start(&ts);
         (test->test ? test->test : nothing)();
     }