From owner-svn-src-all@FreeBSD.ORG  Tue Mar  3 07:01:57 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 BF98E106566B;
	Tue,  3 Mar 2009 07:01:57 +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 AD58F8FC08;
	Tue,  3 Mar 2009 07:01:57 +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 n2371vSk000998;
	Tue, 3 Mar 2009 07:01:57 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2371vcS000997;
	Tue, 3 Mar 2009 07:01:57 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903030701.n2371vcS000997@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Tue, 3 Mar 2009 07:01:57 +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: r189296 - 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: Tue, 03 Mar 2009 07:01:58 -0000

Author: kientzle
Date: Tue Mar  3 07:01:57 2009
New Revision: 189296
URL: http://svn.freebsd.org/changeset/base/189296

Log:
  Merge r294 from libarchive.googlecode.com: Skip testing for
  locale-based failures on systems where the "C" locale is so permissive
  that it cannot possibly fail.  In particular, this fixes a test
  problem on Cygwin.

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	Tue Mar  3 06:39:38 2009	(r189295)
+++ head/lib/libarchive/test/test_pax_filename_encoding.c	Tue Mar  3 07:01:57 2009	(r189296)
@@ -210,6 +210,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));