about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--misc/tst-efgcvt.c15
2 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1153c53ec4..7d723f5e7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-11-09  Gabriel F. T. Gomes  <gabriel@inconstante.eti.br>
+
+	* misc/tst-efgcvt.c: Include support/check.h and
+	support/test-driver.c.  Do not include test-skeleton.c.
+	(error_count): Remove.
+	(output_error): Replace increments to error_count with calls to
+	support_record_failure.
+	(output_r_error): Likewise.
+	(special): Likewise.
+	(do_test): Unconditionally return zero.
+	(TEST_FUNCTION): Remove.
+
 2018-11-09  Joseph Myers  <joseph@codesourcery.com>
 
 	* conform/Makefile ($(conformtest-header-tests)): Create $(@D),
diff --git a/misc/tst-efgcvt.c b/misc/tst-efgcvt.c
index bb716d5198..5a598f49e3 100644
--- a/misc/tst-efgcvt.c
+++ b/misc/tst-efgcvt.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-int error_count;
+#include <support/check.h>
 
 typedef struct
 {
@@ -101,7 +101,7 @@ output_error (const char *name, double value, int ndigit,
 	  res_p, res_decpt, res_sign);
   printf ("Should be  p: \"%s\", decpt: %d, sign: %d\n",
 	  exp_p, exp_decpt, exp_sign);
-  ++error_count;
+  support_record_failure ();
 }
 
 
@@ -116,7 +116,7 @@ output_r_error (const char *name, double value, int ndigit,
 	  res_p, res_decpt, res_sign, res_return);
   printf ("Should be  buf: \"%s\", decpt: %d, sign: %d\n",
 	  exp_p, exp_decpt, exp_sign);
-  ++error_count;
+  support_record_failure ();
 }
 
 static void
@@ -189,13 +189,13 @@ special (void)
   if (res == 0)
     {
       printf ("ecvt_r with a too small buffer was succesful.\n");
-      ++error_count;
+      support_record_failure ();
     }
   res = fcvt_r (123.456, 10, &decpt, &sign, buf, 1);
   if (res == 0)
     {
       printf ("fcvt_r with a too small buffer was succesful.\n");
-      ++error_count;
+      support_record_failure ();
     }
 }
 
@@ -209,8 +209,7 @@ do_test (void)
   test_r (fcvt_tests, fcvt_r, "fcvt_r");
   special ();
 
-  return error_count;
+  return 0;
 }
 
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>