IFC @ r225592

sys/dev/bvm/bvm_console.c - move up to the new alt-break order.

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/libarchive/test/test_read_format_isozisofs_bz2.c b/lib/libarchive/test/test_read_format_isozisofs_bz2.c
index 56c39c0..a4f392e 100644
--- a/lib/libarchive/test/test_read_format_isozisofs_bz2.c
+++ b/lib/libarchive/test/test_read_format_isozisofs_bz2.c
@@ -96,10 +96,10 @@ DEFINE_TEST(test_read_format_isozisofs_bz2)
 			assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
 			assertEqualInt(1, archive_entry_uid(ae));
 			assertEqualInt(2, archive_entry_gid(ae));
-		} else if (strcmp("hardlink", archive_entry_pathname(ae)) == 0) {
+		} else if (strcmp("file", archive_entry_pathname(ae)) == 0) {
 			int r;
 			/* A regular file. */
-			assertEqualString("hardlink", archive_entry_pathname(ae));
+			assertEqualString("file", archive_entry_pathname(ae));
 			assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
 			assertEqualInt(12345684, archive_entry_size(ae));
 			r = archive_read_data_block(a, &p, &size, &offset);
@@ -111,23 +111,23 @@ DEFINE_TEST(test_read_format_isozisofs_bz2)
 			  assertEqualMem(p, "hello\n", 6);
 			}
 			assertEqualInt(86401, archive_entry_mtime(ae));
+			assertEqualInt(86401, archive_entry_atime(ae));
 			assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
 			assertEqualInt(1, archive_entry_uid(ae));
 			assertEqualInt(2, archive_entry_gid(ae));
-		} else if (strcmp("file", archive_entry_pathname(ae)) == 0) {
+		} else if (strcmp("hardlink", archive_entry_pathname(ae)) == 0) {
 			/* A hardlink to the regular file. */
 			/* Note: If "hardlink" gets returned before "file",
 			 * then "hardlink" will get returned as a regular file
 			 * and "file" will get returned as the hardlink.
 			 * This test should tolerate that, since it's a
 			 * perfectly permissible thing for libarchive to do. */
-			assertEqualString("file", archive_entry_pathname(ae));
+			assertEqualString("hardlink", archive_entry_pathname(ae));
 			assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
-			assertEqualString("hardlink", archive_entry_hardlink(ae));
+			assertEqualString("file", archive_entry_hardlink(ae));
 			assertEqualInt(0, archive_entry_size_is_set(ae));
 			assertEqualInt(0, archive_entry_size(ae));
 			assertEqualInt(86401, archive_entry_mtime(ae));
-			assertEqualInt(86401, archive_entry_atime(ae));
 			assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
 			assertEqualInt(1, archive_entry_uid(ae));
 			assertEqualInt(2, archive_entry_gid(ae));