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

[Tim Kientzle]

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