From owner-svn-src-head@FreeBSD.ORG  Sat Jan 31 18:32:39 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AF9A810656D7;
	Sat, 31 Jan 2009 18:32:39 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 62FA68FC1C;
	Sat, 31 Jan 2009 18:32:39 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0VIWdUR031389;
	Sat, 31 Jan 2009 18:32:39 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0VIWdst031388;
	Sat, 31 Jan 2009 18:32:39 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200901311832.n0VIWdst031388@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Sat, 31 Jan 2009 18:32:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187963 - head/tools/regression/lib/libc/stdio
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jan 2009 18:32:40 -0000

Author: das
Date: Sat Jan 31 18:32:39 2009
New Revision: 187963
URL: http://svn.freebsd.org/changeset/base/187963

Log:
  Test wprintf() in addition to printf().

Modified:
  head/tools/regression/lib/libc/stdio/test-printfloat.c

Modified: head/tools/regression/lib/libc/stdio/test-printfloat.c
==============================================================================
--- head/tools/regression/lib/libc/stdio/test-printfloat.c	Sat Jan 31 18:31:57 2009	(r187962)
+++ head/tools/regression/lib/libc/stdio/test-printfloat.c	Sat Jan 31 18:32:39 2009	(r187963)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002, 2005 David Schultz <das@FreeBSD.org>
+ * Copyright (c) 2002-2009 David Schultz <das@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
 
 #define	testfmt(result, fmt, ...)	\
 	_testfmt((result), __LINE__, #__VA_ARGS__, fmt, __VA_ARGS__)
@@ -326,10 +327,13 @@ smash_stack(void)
 void
 _testfmt(const char *result, int line, const char *argstr, const char *fmt,...)
 {
-	char s[100];
-	va_list ap;
+#define	BUF	100
+	wchar_t ws[BUF], wfmt[BUF], wresult[BUF];
+	char s[BUF];
+	va_list ap, ap2;
 
 	va_start(ap, fmt);
+	va_copy(ap2, ap);
 	smash_stack();
 	vsnprintf(s, sizeof(s), fmt, ap);
 	if (strcmp(result, s) != 0) {
@@ -338,4 +342,16 @@ _testfmt(const char *result, int line, c
 		    line, fmt, argstr, s, result);
 		abort();
 	}
+
+	smash_stack();
+	mbstowcs(ws, s, BUF - 1);
+	mbstowcs(wfmt, fmt, BUF - 1);
+	mbstowcs(wresult, result, BUF - 1);
+	vswprintf(ws, sizeof(ws) / sizeof(ws[0]), wfmt, ap2);
+	if (wcscmp(wresult, ws) != 0) {
+		fprintf(stderr,
+		    "%d: wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]\n",
+		    line, wfmt, argstr, ws, wresult);
+		abort();
+	}	
 }