* [PATCH v2] Update wcsmbs tests to use the support test driver.
@ 2017-04-03 18:02 Wainer dos Santos Moschetta
2017-04-03 18:09 ` Adhemerval Zanella
0 siblings, 1 reply; 2+ messages in thread
From: Wainer dos Santos Moschetta @ 2017-04-03 18:02 UTC (permalink / raw)
To: libc-alpha
Changes since v1:
- Undo changes in return of do_test function.
--- >8 ---
Replaced test-skeleton.c with support/test-driver.c and
adjusted the tests accordinly.
Checked on x86_64.
2017-04-03 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
* wcsmbs/tst-btowc.c: Import support/test-driver.c and remove
the TEST_FUNCTION macro definition.
* wcsmbs/tst-mbrtowc2.c: Likewise.
* wcsmbs/tst-mbsrtowcs.c: Likewise.
* wcsmbs/tst-wchar-h.c: Likewise.
* wcsmbs/tst-wcpncpy.c: Likewise.
* wcsmbs/tst-wcrtomb.c: Likewise.
* wcsmbs/tst-wcsnlen.c: Likewise.
* wcsmbs/tst-wcstof.c: Likewise.
---
wcsmbs/tst-btowc.c | 3 +--
wcsmbs/tst-mbrtowc2.c | 3 +--
wcsmbs/tst-mbsrtowcs.c | 3 +--
wcsmbs/tst-wchar-h.c | 3 +--
wcsmbs/tst-wcpncpy.c | 3 +--
wcsmbs/tst-wcrtomb.c | 3 +--
wcsmbs/tst-wcsnlen.c | 3 +--
wcsmbs/tst-wcstof.c | 3 +--
8 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/wcsmbs/tst-btowc.c b/wcsmbs/tst-btowc.c
index 00c9f23..670ee22 100644
--- a/wcsmbs/tst-btowc.c
+++ b/wcsmbs/tst-btowc.c
@@ -173,5 +173,4 @@ do_test (void)
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/wcsmbs/tst-mbrtowc2.c b/wcsmbs/tst-mbrtowc2.c
index 67d8e29..975043a 100644
--- a/wcsmbs/tst-mbrtowc2.c
+++ b/wcsmbs/tst-mbrtowc2.c
@@ -63,5 +63,4 @@ t (const char *ch, size_t nch, const char *loc)
return ret;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/wcsmbs/tst-mbsrtowcs.c b/wcsmbs/tst-mbsrtowcs.c
index bed76bf..91ce116 100644
--- a/wcsmbs/tst-mbsrtowcs.c
+++ b/wcsmbs/tst-mbsrtowcs.c
@@ -63,5 +63,4 @@ do_test (void)
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/wcsmbs/tst-wchar-h.c b/wcsmbs/tst-wchar-h.c
index fd2ad56..047ba6c 100644
--- a/wcsmbs/tst-wchar-h.c
+++ b/wcsmbs/tst-wchar-h.c
@@ -8,5 +8,4 @@ do_test (void)
return sizeof (x) - sizeof (mbstate_t);
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/wcsmbs/tst-wcpncpy.c b/wcsmbs/tst-wcpncpy.c
index 17a31fb..99b00a5 100644
--- a/wcsmbs/tst-wcpncpy.c
+++ b/wcsmbs/tst-wcpncpy.c
@@ -75,5 +75,4 @@ do_test (void)
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/wcsmbs/tst-wcrtomb.c b/wcsmbs/tst-wcrtomb.c
index 052a254..a506fe7 100644
--- a/wcsmbs/tst-wcrtomb.c
+++ b/wcsmbs/tst-wcrtomb.c
@@ -93,5 +93,4 @@ check_ascii (const char *locname)
return res != 0;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/wcsmbs/tst-wcsnlen.c b/wcsmbs/tst-wcsnlen.c
index e057885..89b5212 100644
--- a/wcsmbs/tst-wcsnlen.c
+++ b/wcsmbs/tst-wcsnlen.c
@@ -49,5 +49,4 @@ do_test (void)
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/wcsmbs/tst-wcstof.c b/wcsmbs/tst-wcstof.c
index d3d75f8..5b7cdea 100644
--- a/wcsmbs/tst-wcstof.c
+++ b/wcsmbs/tst-wcstof.c
@@ -30,5 +30,4 @@ do_test (void)
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
--
2.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Update wcsmbs tests to use the support test driver.
2017-04-03 18:02 [PATCH v2] Update wcsmbs tests to use the support test driver Wainer dos Santos Moschetta
@ 2017-04-03 18:09 ` Adhemerval Zanella
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2017-04-03 18:09 UTC (permalink / raw)
To: libc-alpha
LGTM.
On 03/04/2017 15:01, Wainer dos Santos Moschetta wrote:
> Changes since v1:
> - Undo changes in return of do_test function.
>
> --- >8 ---
> Replaced test-skeleton.c with support/test-driver.c and
> adjusted the tests accordinly.
>
> Checked on x86_64.
>
> 2017-04-03 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
>
> * wcsmbs/tst-btowc.c: Import support/test-driver.c and remove
> the TEST_FUNCTION macro definition.
> * wcsmbs/tst-mbrtowc2.c: Likewise.
> * wcsmbs/tst-mbsrtowcs.c: Likewise.
> * wcsmbs/tst-wchar-h.c: Likewise.
> * wcsmbs/tst-wcpncpy.c: Likewise.
> * wcsmbs/tst-wcrtomb.c: Likewise.
> * wcsmbs/tst-wcsnlen.c: Likewise.
> * wcsmbs/tst-wcstof.c: Likewise.
> ---
> wcsmbs/tst-btowc.c | 3 +--
> wcsmbs/tst-mbrtowc2.c | 3 +--
> wcsmbs/tst-mbsrtowcs.c | 3 +--
> wcsmbs/tst-wchar-h.c | 3 +--
> wcsmbs/tst-wcpncpy.c | 3 +--
> wcsmbs/tst-wcrtomb.c | 3 +--
> wcsmbs/tst-wcsnlen.c | 3 +--
> wcsmbs/tst-wcstof.c | 3 +--
> 8 files changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/wcsmbs/tst-btowc.c b/wcsmbs/tst-btowc.c
> index 00c9f23..670ee22 100644
> --- a/wcsmbs/tst-btowc.c
> +++ b/wcsmbs/tst-btowc.c
> @@ -173,5 +173,4 @@ do_test (void)
> return result;
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
> diff --git a/wcsmbs/tst-mbrtowc2.c b/wcsmbs/tst-mbrtowc2.c
> index 67d8e29..975043a 100644
> --- a/wcsmbs/tst-mbrtowc2.c
> +++ b/wcsmbs/tst-mbrtowc2.c
> @@ -63,5 +63,4 @@ t (const char *ch, size_t nch, const char *loc)
> return ret;
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
> diff --git a/wcsmbs/tst-mbsrtowcs.c b/wcsmbs/tst-mbsrtowcs.c
> index bed76bf..91ce116 100644
> --- a/wcsmbs/tst-mbsrtowcs.c
> +++ b/wcsmbs/tst-mbsrtowcs.c
> @@ -63,5 +63,4 @@ do_test (void)
> return result;
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
> diff --git a/wcsmbs/tst-wchar-h.c b/wcsmbs/tst-wchar-h.c
> index fd2ad56..047ba6c 100644
> --- a/wcsmbs/tst-wchar-h.c
> +++ b/wcsmbs/tst-wchar-h.c
> @@ -8,5 +8,4 @@ do_test (void)
> return sizeof (x) - sizeof (mbstate_t);
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
> diff --git a/wcsmbs/tst-wcpncpy.c b/wcsmbs/tst-wcpncpy.c
> index 17a31fb..99b00a5 100644
> --- a/wcsmbs/tst-wcpncpy.c
> +++ b/wcsmbs/tst-wcpncpy.c
> @@ -75,5 +75,4 @@ do_test (void)
> return result;
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
> diff --git a/wcsmbs/tst-wcrtomb.c b/wcsmbs/tst-wcrtomb.c
> index 052a254..a506fe7 100644
> --- a/wcsmbs/tst-wcrtomb.c
> +++ b/wcsmbs/tst-wcrtomb.c
> @@ -93,5 +93,4 @@ check_ascii (const char *locname)
> return res != 0;
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
> diff --git a/wcsmbs/tst-wcsnlen.c b/wcsmbs/tst-wcsnlen.c
> index e057885..89b5212 100644
> --- a/wcsmbs/tst-wcsnlen.c
> +++ b/wcsmbs/tst-wcsnlen.c
> @@ -49,5 +49,4 @@ do_test (void)
> return result;
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
> diff --git a/wcsmbs/tst-wcstof.c b/wcsmbs/tst-wcstof.c
> index d3d75f8..5b7cdea 100644
> --- a/wcsmbs/tst-wcstof.c
> +++ b/wcsmbs/tst-wcstof.c
> @@ -30,5 +30,4 @@ do_test (void)
> return result;
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-03 18:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-03 18:02 [PATCH v2] Update wcsmbs tests to use the support test driver Wainer dos Santos Moschetta
2017-04-03 18:09 ` Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).