From patchwork Wed Mar 29 13:59:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wainer dos Santos Moschetta X-Patchwork-Id: 19757 Received: (qmail 23692 invoked by alias); 29 Mar 2017 13:59:41 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 23586 invoked by uid 89); 29 Mar 2017 13:59:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=495, 935, santos, Santos X-HELO: mx0a-001b2d01.pphosted.com From: Wainer dos Santos Moschetta To: libc-alpha@sourceware.org Subject: [PATCH] Update wcsmbs tests to use the support test driver. Date: Wed, 29 Mar 2017 10:59:20 -0300 X-TM-AS-MML: disable x-cbid: 17032913-0028-0000-0000-000001A58C9B X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17032913-0029-0000-0000-000014A4DD7D Message-Id: <20170329135920.18316-1-wainersm@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-29_10:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703290119 Replaced test-skeleton.c with support/test-driver.c and adjusted the tests accordinly. Checked on x86_64. 2017-03-28 Wainer dos Santos Moschetta * wcsmbs/tst-btowc.c: Import support/test-driver.c, remove TEST_FUNCTION macro, and adjust return of do_test function. return of do_test method. * 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 | 5 ++--- wcsmbs/tst-mbrtowc2.c | 5 ++--- wcsmbs/tst-mbsrtowcs.c | 5 ++--- wcsmbs/tst-wchar-h.c | 5 ++--- wcsmbs/tst-wcpncpy.c | 5 ++--- wcsmbs/tst-wcrtomb.c | 5 ++--- wcsmbs/tst-wcsnlen.c | 5 ++--- wcsmbs/tst-wcstof.c | 5 ++--- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/wcsmbs/tst-btowc.c b/wcsmbs/tst-btowc.c index 00c9f23..6e7d1a7 100644 --- a/wcsmbs/tst-btowc.c +++ b/wcsmbs/tst-btowc.c @@ -74,7 +74,7 @@ eof_test (void) /* Test the btowc() function for a few locales with known character sets. */ -static int +int do_test (void) { int result = 0; @@ -173,5 +173,4 @@ do_test (void) return result; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/wcsmbs/tst-mbrtowc2.c b/wcsmbs/tst-mbrtowc2.c index 67d8e29..cc5d561 100644 --- a/wcsmbs/tst-mbrtowc2.c +++ b/wcsmbs/tst-mbrtowc2.c @@ -25,7 +25,7 @@ static struct static int t (const char *ch, size_t nch, const char *loc); -static int +int do_test (void) { int r = 0; @@ -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 diff --git a/wcsmbs/tst-mbsrtowcs.c b/wcsmbs/tst-mbsrtowcs.c index bed76bf..6b41469 100644 --- a/wcsmbs/tst-mbsrtowcs.c +++ b/wcsmbs/tst-mbsrtowcs.c @@ -21,7 +21,7 @@ #include #include -static int +int do_test (void) { const unsigned char buf[] = { 'a', 'b', '\0', 'c', 'd', '\0', 'e' }; @@ -63,5 +63,4 @@ do_test (void) return result; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/wcsmbs/tst-wchar-h.c b/wcsmbs/tst-wchar-h.c index fd2ad56..bc4ddf2 100644 --- a/wcsmbs/tst-wchar-h.c +++ b/wcsmbs/tst-wchar-h.c @@ -1,12 +1,11 @@ #include #include -static int +int do_test (void) { mbstate_t x; return sizeof (x) - sizeof (mbstate_t); } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/wcsmbs/tst-wcpncpy.c b/wcsmbs/tst-wcpncpy.c index 17a31fb..5ed15d6 100644 --- a/wcsmbs/tst-wcpncpy.c +++ b/wcsmbs/tst-wcpncpy.c @@ -20,7 +20,7 @@ #include -static int +int do_test (void) { int result = 0; @@ -75,5 +75,4 @@ do_test (void) return result; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/wcsmbs/tst-wcrtomb.c b/wcsmbs/tst-wcrtomb.c index 052a254..4aa47c6 100644 --- a/wcsmbs/tst-wcrtomb.c +++ b/wcsmbs/tst-wcrtomb.c @@ -26,7 +26,7 @@ static int check_ascii (const char *locname); -static int +int do_test (void) { int result = 0; @@ -93,5 +93,4 @@ check_ascii (const char *locname) return res != 0; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/wcsmbs/tst-wcsnlen.c b/wcsmbs/tst-wcsnlen.c index e057885..42b9632 100644 --- a/wcsmbs/tst-wcsnlen.c +++ b/wcsmbs/tst-wcsnlen.c @@ -27,7 +27,7 @@ printf ("wcsnlen (L\"%s\", %d) = %d, not %d\n", Str, Max, n, Exp); \ } -static int +int do_test (void) { int result = 0; @@ -49,5 +49,4 @@ do_test (void) return result; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/wcsmbs/tst-wcstof.c b/wcsmbs/tst-wcstof.c index d3d75f8..8c4d830 100644 --- a/wcsmbs/tst-wcstof.c +++ b/wcsmbs/tst-wcstof.c @@ -5,7 +5,7 @@ #include #include -static int +int do_test (void) { int result = 0; @@ -30,5 +30,4 @@ do_test (void) return result; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include