From owner-svn-src-all@FreeBSD.ORG  Sat Mar  7 03:41:29 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98F92106566B;
	Sat,  7 Mar 2009 03:41:29 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 86D698FC0A;
	Sat,  7 Mar 2009 03:41:29 +0000 (UTC)
	(envelope-from kientzle@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 n273fT0S037858;
	Sat, 7 Mar 2009 03:41:29 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n273fTIq037857;
	Sat, 7 Mar 2009 03:41:29 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903070341.n273fTIq037857@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 7 Mar 2009 03:41:29 +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: r189484 - head/lib/libarchive/test
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Mar 2009 03:41:30 -0000

Author: kientzle
Date: Sat Mar  7 03:41:29 2009
New Revision: 189484
URL: http://svn.freebsd.org/changeset/base/189484

Log:
  Merge r348 from libarchive.googlecode.com:  Suppress testing invalid
  conversions if there aren't any.  In particular, Cygwin's "C" locale
  has no invalid inputs for wctomb().

Modified:
  head/lib/libarchive/test/test_pax_filename_encoding.c

Modified: head/lib/libarchive/test/test_pax_filename_encoding.c
==============================================================================
--- head/lib/libarchive/test/test_pax_filename_encoding.c	Sat Mar  7 03:34:34 2009	(r189483)
+++ head/lib/libarchive/test/test_pax_filename_encoding.c	Sat Mar  7 03:41:29 2009	(r189484)
@@ -217,6 +217,13 @@ DEFINE_TEST(test_pax_filename_encoding_3
 		return;
 	}
 
+	/* If wctomb is broken, warn and return. */
+	if (wctomb(buff, 0x1234) > 0) {
+		skipping("Cannot test conversion failures because \"C\" "
+		    "locale on this system has no invalid characters.");
+		return;
+	}
+
 	assert((a = archive_write_new()) != NULL);
 	assertEqualIntA(a, 0, archive_write_set_format_pax(a));
 	assertEqualIntA(a, 0, archive_write_set_compression_none(a));