Merge r1058 from libarchive.googlecode.com: Require that each

test source file has exactly one DEFINE_TEST().

1 files changed, 13 insertions, 3 deletions

diff --git a/lib/libarchive/test/test_pax_filename_encoding.c b/lib/libarchive/test/test_pax_filename_encoding.c
index f882b28..45f9848 100644
--- a/lib/libarchive/test/test_pax_filename_encoding.c
+++ b/lib/libarchive/test/test_pax_filename_encoding.c
@@ -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();
+}