svn commit: r189296 - head/lib/libarchive/test

[Tim Kientzle]

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));