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

[Tim Kientzle]

Author: kientzle
Date: Mon Apr 27 19:20:25 2009
New Revision: 191590
URL: http://svn.freebsd.org/changeset/base/191590

Log:
  Merge r1058 from libarchive.googlecode.com:  Require that each
  test source file has exactly one DEFINE_TEST().

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

Modified: head/lib/libarchive/test/test_pax_filename_encoding.c
==============================================================================
--- head/lib/libarchive/test/test_pax_filename_encoding.c	Mon Apr 27 19:18:55 2009	(r191589)
+++ head/lib/libarchive/test/test_pax_filename_encoding.c	Mon Apr 27 19:20:25 2009	(r191590)
@@ -40,7 +40,8 @@ __FBSDID("$FreeBSD$");
  * the right filename returned and that we get a warning only
  * if the header isn't marked as binary.
  */
-DEFINE_TEST(test_pax_filename_encoding_1)
+static void
+test_pax_filename_encoding_1(void)
 {
 	static const char testname[] = "test_pax_filename_encoding.tar";
 	/*
@@ -84,7 +85,8 @@ DEFINE_TEST(test_pax_filename_encoding_1
  * This should work; the underlying implementation should automatically
  * fall back to storing the pathname in binary.
  */
-DEFINE_TEST(test_pax_filename_encoding_2)
+static void
+test_pax_filename_encoding_2(void)
 {
 	char filename[] = "abc\314\214mno\374xyz";
 	struct archive *a;
@@ -191,7 +193,8 @@ DEFINE_TEST(test_pax_filename_encoding_2
  * read it back into "C" locale, which doesn't support the name.
  * TODO: Figure out the "right" behavior here.
  */
-DEFINE_TEST(test_pax_filename_encoding_3)
+static void
+test_pax_filename_encoding_3(void)
 {
 	wchar_t badname[] = L"xxxAyyyBzzz";
 	const char badname_utf8[] = "xxx\xE1\x88\xB4yyy\xE5\x99\xB8zzz";
@@ -325,3 +328,10 @@ DEFINE_TEST(test_pax_filename_encoding_3
 	assertEqualInt(0, archive_read_finish(a));
 #endif
 }
+
+DEFINE_TEST(test_pax_filename_encoding)
+{
+	test_pax_filename_encoding_1();
+	test_pax_filename_encoding_2();
+	test_pax_filename_encoding_3();
+}

Modified: head/lib/libarchive/test/test_read_format_isojoliet_bz2.c
==============================================================================
--- head/lib/libarchive/test/test_read_format_isojoliet_bz2.c	Mon Apr 27 19:18:55 2009	(r191589)
+++ head/lib/libarchive/test/test_read_format_isojoliet_bz2.c	Mon Apr 27 19:20:25 2009	(r191590)
@@ -177,11 +177,7 @@ joliettest(int withrr)
 DEFINE_TEST(test_read_format_isojoliet_bz2)
 {
 	joliettest(0);
-}
-
 
-DEFINE_TEST(test_read_format_isojolietrr_bz2)
-{
 	/* XXXX This doesn't work today; can it be made to work? */
 #if 0
 	joliettest(1);