summaryrefslogtreecommitdiff
path: root/tests/test-wcwidth.c
diff options
context:
space:
mode:
authorAndreas Rottmann <a.rottmann@gmx.at>2010-05-27 18:23:17 +0200
committerAndreas Rottmann <a.rottmann@gmx.at>2010-05-27 18:23:17 +0200
commitbd6adfa17d453e4c486e36fed4c5779db90a8a0e (patch)
tree9798677560d5f99061afe9f0db105a8c97f2438a /tests/test-wcwidth.c
parent79ca645d222db2e158784642c3b464a47bea26f3 (diff)
parent3e0814cd9862b89c7a39672672937477bd87ddfb (diff)
Merge commit 'upstream/0.9.3'
Diffstat (limited to 'tests/test-wcwidth.c')
-rw-r--r--tests/test-wcwidth.c30
1 files changed, 10 insertions, 20 deletions
diff --git a/tests/test-wcwidth.c b/tests/test-wcwidth.c
index 582a8aa..f6f9792 100644
--- a/tests/test-wcwidth.c
+++ b/tests/test-wcwidth.c
@@ -1,5 +1,5 @@
/* Test of wcwidth() function.
- Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ Copyright (C) 2007-2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,24 +20,14 @@
#include <wchar.h>
+#include "signature.h"
+SIGNATURE_CHECK (wcwidth, int, (wchar_t));
+
#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include "localcharset.h"
-
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- fflush (stderr); \
- abort (); \
- } \
- } \
- while (0)
+#include "macros.h"
int
main ()
@@ -51,15 +41,15 @@ main ()
/* Switch to an UTF-8 locale. */
if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL
/* Check whether it's really an UTF-8 locale.
- On OpenBSD 4.0, the setlocale call succeeds only for the LC_CTYPE
- category and therefore returns "C/fr_FR.UTF-8/C/C/C/C", but the
- LC_CTYPE category is effectively set to an ASCII LC_CTYPE category;
- in particular, locale_charset() returns "ASCII". */
+ On OpenBSD 4.0, the setlocale call succeeds only for the LC_CTYPE
+ category and therefore returns "C/fr_FR.UTF-8/C/C/C/C", but the
+ LC_CTYPE category is effectively set to an ASCII LC_CTYPE category;
+ in particular, locale_charset() returns "ASCII". */
&& strcmp (locale_charset (), "UTF-8") == 0)
{
/* Test width of ASCII characters. */
for (wc = 0x20; wc < 0x7F; wc++)
- ASSERT (wcwidth (wc) == 1);
+ ASSERT (wcwidth (wc) == 1);
/* Test width of some non-spacing characters. */
ASSERT (wcwidth (0x0301) == 0);