Update wcsmbs tests to use the support test driver

Replaced test-skeleton.c with support/test-driver.c and
adjusted the tests accordinly.

Checked on x86_64-linux-gnu.

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 37a7625a8386d2c2eb344ee9200fa64cde82fe4e..7bc25077b8592d255dce05455b9ccdbe5b54a1e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2017-04-04  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.
+
 2017-04-04  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
        * nptl/pthread_create.c (START_THREAD_DEFN): Remove

diff --git a/wcsmbs/tst-btowc.c b/wcsmbs/tst-btowc.c
index 00c9f231c8f2804df1448107ae2faa4deae82ba3..670ee2226f766386c2a17f4384eb536866a1e6ce 100644 (file)
--- 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 67d8e29a0f7ebc86b2f453ad9a79880ad9a51341..975043accd0f883d03828b83e01af55e8a763fa6 100644 (file)
--- 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 bed76bf4ef81fde7a15b052bb37b83dd9cb95e21..91ce1166bbb8943da0119c8ea069d3e00654a1a6 100644 (file)
--- 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 fd2ad569a723b184878f643680e196303ffa193b..047ba6c37709196b9ea61265120c9d843bf8c59b 100644 (file)
--- 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 17a31fbbd724d638d9302a9f187601d3dbe1aa01..99b00a5cf6ba62492feec3db674168d9a545de06 100644 (file)
--- 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 052a2549b46922bd5e4dff41349cfb1fde2d3f09..a506fe7e7532964107bfd808f06386c133310ac9 100644 (file)
--- 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 e057885f989f878af8fd483e2d4a01713905d9d3..89b5212006f536118361d5582e6cce933196929c 100644 (file)
--- 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 d3d75f8f60931cac16cecb276eefaf2b891d2999..5b7cdeacd8896b947872e4d8a3d56978e95c9ef0 100644 (file)
--- 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>