Right now ISO reader read Rock Ridge extentions of the root directory properly,

so some comparing datas must be changed.

SVN-Revision: 1490

diff --git a/libarchive/test/test_read_format_isorr_bz2.c b/libarchive/test/test_read_format_isorr_bz2.c
index 0f34a0d8b93499382650deb6138461a3516ed101..7a3cd0a1c279674ef7665f54be5ce6013a5549f8 100644 (file)
--- a/libarchive/test/test_read_format_isorr_bz2.c
+++ b/libarchive/test/test_read_format_isorr_bz2.c
@@ -45,9 +45,9 @@ ln /tmp/iso/file /tmp/iso/hardlink
 (cd /tmp/iso; ln -s .///file symlink5)
 (cd /tmp/iso; ln -s /tmp//../ symlink6)
 TZ=utc touch -afhm -t 197001020000.01 /tmp/iso /tmp/iso/file /tmp/iso/dir
-TZ=utc touch -afhm -t 197001030000.02 /tmp/iso/symlink
-mkhybrid -R -uid 1 -gid 2 /tmp/iso | bzip2 > test_read_format_isorr_bz2.iso.bz2
+TZ=utc touch -afhm -t 197001030000.02 /tmp/iso/symlink /tmp/iso/symlink5
 F=test_read_format_isorr_bz2.iso.bz2
+mkhybrid -R -uid 1 -gid 2 /tmp/iso | bzip2 > $F
 uuencode $F $F > $F.uu
 exit 1
  */
@@ -85,11 +85,12 @@ DEFINE_TEST(test_read_format_isorr_bz2)
                        /* '.' root directory. */
                        assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
                        assertEqualInt(2048, archive_entry_size(ae));
+                       /* Now, we read timestamp recorded by RRIP "TF". */ 
                        assertEqualInt(86401, archive_entry_mtime(ae));
                        assertEqualInt(0, archive_entry_mtime_nsec(ae));
-                       assertEqualInt(86401, archive_entry_ctime(ae));
-                       assertEqualInt(0, archive_entry_stat(ae)->st_nlink);
-                       assertEqualInt(0, archive_entry_uid(ae));
+                       /* Now, we read links recorded by RRIP "PX". */ 
+                       assertEqualInt(3, archive_entry_stat(ae)->st_nlink);
+                       assertEqualInt(1, archive_entry_uid(ae));
                        assertEqualIntA(a, ARCHIVE_EOF,
                            archive_read_data_block(a, &p, &size, &offset));
                        assertEqualInt((int)size, 0);

diff --git a/libarchive/test/test_read_format_isorr_new_bz2.c b/libarchive/test/test_read_format_isorr_new_bz2.c
index 9053202ab77692ce91d2949055d0bdee4e9e4a0a..18170e4ecc7dc504ea2f97580a710b53bf7a7401 100644 (file)
--- a/libarchive/test/test_read_format_isorr_new_bz2.c
+++ b/libarchive/test/test_read_format_isorr_new_bz2.c
@@ -84,11 +84,12 @@ DEFINE_TEST(test_read_format_isorr_new_bz2)
                        /* '.' root directory. */
                        assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
                        assertEqualInt(2048, archive_entry_size(ae));
+                       /* Now, we read timestamp recorded by RRIP "TF". */
                        assertEqualInt(86401, archive_entry_mtime(ae));
                        assertEqualInt(0, archive_entry_mtime_nsec(ae));
-                       assertEqualInt(86401, archive_entry_ctime(ae));
-                       assertEqualInt(0, archive_entry_stat(ae)->st_nlink);
-                       assertEqualInt(0, archive_entry_uid(ae));
+                       /* Now, we read links recorded by RRIP "PX". */
+                       assertEqualInt(3, archive_entry_stat(ae)->st_nlink);
+                       assertEqualInt(1, archive_entry_uid(ae));
                        assertEqualIntA(a, ARCHIVE_EOF,
                            archive_read_data_block(a, &p, &size, &offset));
                        assertEqualInt((int)size, 0);

diff --git a/libarchive/test/test_read_format_isozisofs_bz2.c b/libarchive/test/test_read_format_isozisofs_bz2.c
index 025b814f6cb963551084413f1c1adf967fae2dde..c1e8de45187f86a2475337e8622e98e6d53693f3 100644 (file)
--- a/libarchive/test/test_read_format_isozisofs_bz2.c
+++ b/libarchive/test/test_read_format_isozisofs_bz2.c
@@ -84,11 +84,12 @@ DEFINE_TEST(test_read_format_isozisofs_bz2)
                        /* '.' root directory. */
                        assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
                        assertEqualInt(2048, archive_entry_size(ae));
+                       /* Now, we read timestamp recorded by RRIP "TF". */
                        assertEqualInt(86401, archive_entry_mtime(ae));
                        assertEqualInt(0, archive_entry_mtime_nsec(ae));
-                       assertEqualInt(86401, archive_entry_ctime(ae));
-                       assertEqualInt(0, archive_entry_stat(ae)->st_nlink);
-                       assertEqualInt(0, archive_entry_uid(ae));
+                       /* Now, we read links recorded by RRIP "PX". */
+                       assertEqualInt(3, archive_entry_stat(ae)->st_nlink);
+                       assertEqualInt(1, archive_entry_uid(ae));
                        assertEqualIntA(a, ARCHIVE_EOF,
                            archive_read_data_block(a, &p, &size, &offset));
                        assertEqualInt((int)size, 0);