Modify several tests to use test-skeleton.c
Commit Message
These tests were skipped by the use-test-skeleton conversion done in
commit 29955b5d because they were reused in other tests via the #include
directive, and so deemed worth an inspection before they were modified.
This has now been done.
ChangeLog:
2015-07-09 Arjun Shankar <arjun.is@lostca.se>
* elf/tst-leaks1.c (main): Converted to ...
(do_test): ... this.
(TEST_FUNCTION): New macro.
Include test-skeleton.c.
* localedata/tst-langinfo.c (main): Converted to ...
(do_test): ... this.
(TEST_FUNCTION): New macro.
Include test-skeleton.c.
* math/test-fpucw.c (main): Converted to ...
(do_test): ... this.
(TEST_FUNCTION): New macro.
Include test-skeleton.c.
* math/test-tgmath.c (main): Converted to ...
(do_test): ... this.
(TEST_FUNCTION): New macro.
Include test-skeleton.c.
* math/test-tgmath2.c (main): Converted to ...
(do_test): ... this.
(TEST_FUNCTION): New macro.
Include test-skeleton.c.
* setjmp/tst-setjmp.c (main): Converted to ...
(do_test): ... this.
(TEST_FUNCTION): New macro.
Include test-skeleton.c.
* stdio-common/tst-sscanf.c (main): Converted to ...
(do_test): ... this.
(TEST_FUNCTION): New macro.
Include test-skeleton.c.
* sysdeps/x86_64/tst-audit6.c (main): Converted to ...
(do_test): ... this.
(TEST_FUNCTION): New macro.
Include test-skeleton.c.
---
elf/tst-leaks1.c | 7 +++++--
localedata/tst-langinfo.c | 7 +++++--
math/test-fpucw.c | 7 +++++--
math/test-tgmath.c | 7 +++++--
math/test-tgmath2.c | 7 +++++--
setjmp/tst-setjmp.c | 7 +++++--
stdio-common/tst-sscanf.c | 7 +++++--
sysdeps/x86_64/tst-audit6.c | 7 +++++--
8 files changed, 40 insertions(+), 16 deletions(-)
Comments
On Thu, Jul 09, 2015 at 03:29:17PM +0000, Arjun Shankar wrote:
>
> These tests were skipped by the use-test-skeleton conversion done in
> commit 29955b5d because they were reused in other tests via the #include
> directive, and so deemed worth an inspection before they were modified.
> This has now been done.
>
Thanks, committed.
Siddhesh
@@ -3,8 +3,8 @@
#include <mcheck.h>
#include <stdlib.h>
-int
-main (void)
+static int
+do_test (void)
{
mtrace ();
@@ -23,3 +23,6 @@ main (void)
return ret;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
@@ -138,8 +138,8 @@ map_paramstr (const char *str)
# define REASON(str)
#endif
-int
-main (void)
+static int
+do_test (void)
{
int result = 0;
@@ -281,3 +281,6 @@ main (void)
return result;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
@@ -23,8 +23,8 @@
# define FPU_CONTROL _FPU_DEFAULT
#endif
-int
-main (void)
+static int
+do_test (void)
{
#ifdef _FPU_GETCW
/* Some architectures don't have _FPU_GETCW (e.g. Linux/Alpha). */
@@ -44,3 +44,6 @@ main (void)
return 0;
#endif
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
@@ -54,8 +54,8 @@ int count_cldouble;
#define NCALLS_INT 4
#define NCCALLS 47
-int
-main (void)
+static int
+do_test (void)
{
int result = 0;
@@ -210,6 +210,9 @@ main (void)
#include "test-tgmath.c"
#endif
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
#else
#ifdef DEBUG
@@ -334,8 +334,8 @@ test (const int Vint4, const long long int Vllong4)
return result;
}
-int
-main (void)
+static int
+do_test (void)
{
return test (vint1, vllong1);
}
@@ -366,6 +366,9 @@ main (void)
#include "test-tgmath2.c"
#endif
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
#else
#ifdef DEBUG
@@ -28,8 +28,8 @@ jump (int val)
longjmp (env, val);
}
-int
-main (void)
+static int
+do_test (void)
{
int value;
@@ -115,3 +115,6 @@ main (void)
return lose ? EXIT_FAILURE : EXIT_SUCCESS;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
@@ -124,8 +124,8 @@ struct test2
{ L("0x.e+0"), L("%g%c"), 2, '+' },
};
-int
-main (void)
+static int
+do_test (void)
{
double d[6];
long l[6];
@@ -268,3 +268,6 @@ main (void)
return result;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
@@ -25,8 +25,8 @@ avx_enabled (void)
}
-int
-main (void)
+static int
+do_test (void)
{
/* Run AVX test only if AVX is supported. */
if (avx_enabled ())
@@ -40,3 +40,6 @@ main (void)
}
return 0;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../../test-skeleton.c"