From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 8 Oct 2009 22:08:17 +0000 (-0400)
Subject: Disable reading Rock Ridge extentions to read Joliet extentions.
X-Git-Tag: v2.8.0~319
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db31bd3535da4f148162d69b7cd54fc666352003;p=thirdparty%2Flibarchive.git

Disable reading Rock Ridge extentions to read Joliet extentions.

SVN-Revision: 1489
---

diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c
index 84ffbfe87..44042ac26 100644
--- a/libarchive/test/test_read_format_isojoliet_bz2.c
+++ b/libarchive/test/test_read_format_isojoliet_bz2.c
@@ -77,7 +77,7 @@ joliettest(int withrr)
 	assertEqualInt(0, r);
 	assertEqualInt(0, archive_read_support_format_all(a));
 	assertEqualInt(ARCHIVE_OK,
-	    archive_read_set_options(a, "iso9660:joliet"));
+	    archive_read_set_options(a, "iso9660:!rock-ridge"));
 	assertEqualInt(ARCHIVE_OK,
 	    archive_read_open_filename(a, refname, 10240));
 
diff --git a/libarchive/test/test_read_format_isojoliet_long.c b/libarchive/test/test_read_format_isojoliet_long.c
index 2706326cf..891535f99 100644
--- a/libarchive/test/test_read_format_isojoliet_long.c
+++ b/libarchive/test/test_read_format_isojoliet_long.c
@@ -79,7 +79,7 @@ DEFINE_TEST(test_read_format_isojoliet_long)
 	assertEqualInt(0, r);
 	assertEqualInt(0, archive_read_support_format_all(a));
 	assertEqualInt(ARCHIVE_OK,
-	    archive_read_set_options(a, "iso9660:joliet"));
+	    archive_read_set_options(a, "iso9660:!rock-ridge"));
 	assertEqualInt(ARCHIVE_OK,
 	    archive_read_open_filename(a, refname, 10240));