From: Allan Randall <allanr@sgi.com>
Date: Mon, 19 Jun 2006 06:10:49 +0000 (+0000)
Subject: Ordered test and golden output files as test was failing due to sizeof( xfs_alloctype... 
X-Git-Tag: v1.1.0~632
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6631e39f44a09e859b6c51ce6406b9cf9150e35e;p=xfstests-dev.git

Ordered test and golden output files as test was failing due to sizeof( xfs_alloctype_t ) = 4 being on a different line
Merge of master-melb:xfs-cmds:26276a by kenmcd.

  Ordered test and golden output files as test was failing due to sizeof( xfs_alloctype_t ) = 4 being on a different line
---

diff --git a/122 b/122
index 900af2a2..56190cf6 100755
--- a/122
+++ b/122
@@ -143,6 +143,6 @@ echo 'return 0; }' >>$cprog
 
 # create and run program
 cc -o $oprog $cprog
-eval $oprog
+eval $oprog | LC_COLLATE=POSIX sort
 
 status=0
diff --git a/122.out b/122.out
index 39b12f1b..ccc9956d 100644
--- a/122.out
+++ b/122.out
@@ -1,131 +1,131 @@
 QA output created by 122
+offsetof(xfs_sb_t, sb_agblklog ) = 124
+offsetof(xfs_sb_t, sb_agblocks ) = 84
+offsetof(xfs_sb_t, sb_agcount ) = 88
+offsetof(xfs_sb_t, sb_blocklog ) = 120
+offsetof(xfs_sb_t, sb_blocksize ) = 4
+offsetof(xfs_sb_t, sb_dblocks ) = 8
+offsetof(xfs_sb_t, sb_dirblklog ) = 192
+offsetof(xfs_sb_t, sb_fdblocks ) = 144
+offsetof(xfs_sb_t, sb_features2 ) = 200
+offsetof(xfs_sb_t, sb_flags ) = 178
+offsetof(xfs_sb_t, sb_fname[12] ) = 120
+offsetof(xfs_sb_t, sb_frextents ) = 152
+offsetof(xfs_sb_t, sb_gquotino ) = 168
+offsetof(xfs_sb_t, sb_icount ) = 128
+offsetof(xfs_sb_t, sb_ifree ) = 136
+offsetof(xfs_sb_t, sb_imax_pct ) = 127
+offsetof(xfs_sb_t, sb_inoalignmt ) = 180
+offsetof(xfs_sb_t, sb_inodelog ) = 122
+offsetof(xfs_sb_t, sb_inodesize ) = 104
+offsetof(xfs_sb_t, sb_inopblock ) = 106
+offsetof(xfs_sb_t, sb_inopblog ) = 123
+offsetof(xfs_sb_t, sb_inprogress ) = 126
+offsetof(xfs_sb_t, sb_logblocks ) = 96
+offsetof(xfs_sb_t, sb_logsectlog ) = 193
+offsetof(xfs_sb_t, sb_logsectsize ) = 194
+offsetof(xfs_sb_t, sb_logstart ) = 48
+offsetof(xfs_sb_t, sb_logsunit ) = 196
+offsetof(xfs_sb_t, sb_magicnum ) = 0
+offsetof(xfs_sb_t, sb_qflags ) = 176
+offsetof(xfs_sb_t, sb_rblocks ) = 16
+offsetof(xfs_sb_t, sb_rbmblocks ) = 92
+offsetof(xfs_sb_t, sb_rbmino ) = 64
+offsetof(xfs_sb_t, sb_rextents ) = 24
+offsetof(xfs_sb_t, sb_rextsize ) = 80
+offsetof(xfs_sb_t, sb_rextslog ) = 125
+offsetof(xfs_sb_t, sb_rootino ) = 56
+offsetof(xfs_sb_t, sb_rsumino ) = 72
+offsetof(xfs_sb_t, sb_sectlog ) = 121
+offsetof(xfs_sb_t, sb_sectsize ) = 102
+offsetof(xfs_sb_t, sb_shared_vn ) = 179
+offsetof(xfs_sb_t, sb_unit ) = 184
+offsetof(xfs_sb_t, sb_uquotino ) = 160
+offsetof(xfs_sb_t, sb_uuid ) = 32
+offsetof(xfs_sb_t, sb_versionnum ) = 100
+offsetof(xfs_sb_t, sb_width ) = 188
 sizeof( xfs_agf_t ) = 60
-sizeof( xfs_agi_t ) = 296
 sizeof( xfs_agfl_t ) = 4
-sizeof( xfs_alloc_rec_t ) = 8
+sizeof( xfs_agi_t ) = 296
 sizeof( xfs_alloc_rec_incore_t ) = 8
+sizeof( xfs_alloc_rec_t ) = 8
 sizeof( xfs_alloctype_t ) = 4
-sizeof( xfs_attr_leaf_map_t ) = 4
-sizeof( xfs_attr_leaf_hdr_t ) = 32
+sizeof( xfs_attr_inactive_list_t ) = 8
 sizeof( xfs_attr_leaf_entry_t ) = 8
+sizeof( xfs_attr_leaf_hdr_t ) = 32
+sizeof( xfs_attr_leaf_map_t ) = 4
 sizeof( xfs_attr_leaf_name_local_t ) = 4
 sizeof( xfs_attr_leaf_name_remote_t ) = 12
 sizeof( xfs_attr_leafblock_t ) = 56
-sizeof( xfs_attr_inactive_list_t ) = 8
 sizeof( xfs_attr_shortform_t ) = 8
-sizeof( xfs_bmdr_block_t ) = 4
+sizeof( xfs_attrlist_cursor_t ) = 16
+sizeof( xfs_bmbt_key_t ) = 8
 sizeof( xfs_bmbt_rec_32_t ) = 16
 sizeof( xfs_bmbt_rec_64_t ) = 16
-sizeof( xfs_exntfmt_t ) = 4
-sizeof( xfs_exntst_t ) = 4
-sizeof( xfs_bmbt_key_t ) = 8
-sizeof( xfs_btree_sblock_t ) = 16
-sizeof( xfs_btree_lblock_t ) = 24
-sizeof( xfs_btree_hdr_t ) = 8
+sizeof( xfs_bmdr_block_t ) = 4
+sizeof( xfs_btnum_t ) = 4
 sizeof( xfs_btree_block_t ) = 24
-sizeof( xfs_buf_log_format_v1_t ) = 20
+sizeof( xfs_btree_hdr_t ) = 8
+sizeof( xfs_btree_lblock_t ) = 24
+sizeof( xfs_btree_sblock_t ) = 16
 sizeof( xfs_buf_log_format_t ) = 24
+sizeof( xfs_buf_log_format_v1_t ) = 20
 sizeof( xfs_da_blkinfo_t ) = 12
 sizeof( xfs_da_intnode_t ) = 24
-sizeof( xfs_timestamp_t ) = 8
 sizeof( xfs_dinode_core_t ) = 96
 sizeof( xfs_dinode_fmt_t ) = 4
 sizeof( xfs_dir2_data_free_t ) = 4
 sizeof( xfs_dir2_data_hdr_t ) = 16
 sizeof( xfs_dir2_data_unused_t ) = 6
-sizeof( xfs_dir2_leaf_hdr_t ) = 16
-sizeof( xfs_dir2_leaf_entry_t ) = 8
-sizeof( xfs_dir2_leaf_tail_t ) = 4
-sizeof( xfs_dir2_leaf_t ) = 32
 sizeof( xfs_dir2_free_hdr_t ) = 16
 sizeof( xfs_dir2_free_t ) = 20
-sizeof( xfs_dir2_ino8_t ) = 8
 sizeof( xfs_dir2_ino4_t ) = 4
+sizeof( xfs_dir2_ino8_t ) = 8
 sizeof( xfs_dir2_inou_t ) = 8
-sizeof( xfs_dir2_sf_off_t ) = 2
-sizeof( xfs_dir2_sf_hdr_t ) = 10
+sizeof( xfs_dir2_leaf_entry_t ) = 8
+sizeof( xfs_dir2_leaf_hdr_t ) = 16
+sizeof( xfs_dir2_leaf_t ) = 32
+sizeof( xfs_dir2_leaf_tail_t ) = 4
 sizeof( xfs_dir2_sf_entry_t ) = 12
+sizeof( xfs_dir2_sf_hdr_t ) = 10
+sizeof( xfs_dir2_sf_off_t ) = 2
 sizeof( xfs_dir2_sf_t ) = 22
-sizeof( xfs_dir_leaf_map_t ) = 4
-sizeof( xfs_dir_leaf_hdr_t ) = 32
 sizeof( xfs_dir_leaf_entry_t ) = 8
+sizeof( xfs_dir_leaf_hdr_t ) = 32
+sizeof( xfs_dir_leaf_map_t ) = 4
 sizeof( xfs_dir_leaf_name_t ) = 9
 sizeof( xfs_dir_leafblock_t ) = 52
-sizeof( xfs_dircook_t ) = 8
-sizeof( xfs_dir_sf_hdr_t ) = 9
 sizeof( xfs_dir_sf_entry_t ) = 10
+sizeof( xfs_dir_sf_hdr_t ) = 9
 sizeof( xfs_dir_shortform_t ) = 19
-sizeof( xfs_extent_32_t ) = 12
-sizeof( xfs_extent_64_t ) = 16
-sizeof( xfs_efi_log_format_32_t ) = 28
-sizeof( xfs_efi_log_format_64_t ) = 32
+sizeof( xfs_dircook_t ) = 8
+sizeof( xfs_disk_dquot_t ) = 104
+sizeof( xfs_dq_logformat_t ) = 24
+sizeof( xfs_dqblk_t ) = 136
 sizeof( xfs_efd_log_format_32_t ) = 28
 sizeof( xfs_efd_log_format_64_t ) = 32
-sizeof( xfs_fsop_geom_t ) = 112
+sizeof( xfs_efi_log_format_32_t ) = 28
+sizeof( xfs_efi_log_format_64_t ) = 32
+sizeof( xfs_error_injection_t ) = 8
+sizeof( xfs_exntfmt_t ) = 4
+sizeof( xfs_exntst_t ) = 4
+sizeof( xfs_extent_32_t ) = 12
+sizeof( xfs_extent_64_t ) = 16
+sizeof( xfs_fid2_t ) = 16
+sizeof( xfs_fid_t ) = 16
+sizeof( xfs_fsid_t ) = 8
 sizeof( xfs_fsop_counts_t ) = 32
+sizeof( xfs_fsop_geom_t ) = 112
 sizeof( xfs_fsop_resblks_t ) = 16
 sizeof( xfs_growfs_log_t ) = 8
-sizeof( xfs_error_injection_t ) = 8
-sizeof( xfs_attrlist_cursor_t ) = 16
-sizeof( xfs_fsid_t ) = 8
-sizeof( xfs_fid_t ) = 16
-sizeof( xfs_fid2_t ) = 16
 sizeof( xfs_handle_t ) = 24
-sizeof( xfs_inobt_rec_t ) = 16
 sizeof( xfs_inobt_key_t ) = 4
+sizeof( xfs_inobt_rec_t ) = 16
 sizeof( xfs_inode_log_format_32_t ) = 52
 sizeof( xfs_inode_log_format_64_t ) = 56
-sizeof( xfs_trans_reservations_t ) = 84
-sizeof( xfs_disk_dquot_t ) = 104
-sizeof( xfs_dqblk_t ) = 136
-sizeof( xfs_dq_logformat_t ) = 24
+sizeof( xfs_lookup_t ) = 4
 sizeof( xfs_qoff_logformat_t ) = 20
 sizeof( xfs_sb_field_t ) = 4
+sizeof( xfs_timestamp_t ) = 8
 sizeof( xfs_trans_header_t ) = 16
-sizeof( xfs_lookup_t ) = 4
-sizeof( xfs_btnum_t ) = 4
-offsetof(xfs_sb_t, sb_magicnum ) = 0
-offsetof(xfs_sb_t, sb_blocksize ) = 4
-offsetof(xfs_sb_t, sb_dblocks ) = 8
-offsetof(xfs_sb_t, sb_rblocks ) = 16
-offsetof(xfs_sb_t, sb_rextents ) = 24
-offsetof(xfs_sb_t, sb_uuid ) = 32
-offsetof(xfs_sb_t, sb_logstart ) = 48
-offsetof(xfs_sb_t, sb_rootino ) = 56
-offsetof(xfs_sb_t, sb_rbmino ) = 64
-offsetof(xfs_sb_t, sb_rsumino ) = 72
-offsetof(xfs_sb_t, sb_rextsize ) = 80
-offsetof(xfs_sb_t, sb_agblocks ) = 84
-offsetof(xfs_sb_t, sb_agcount ) = 88
-offsetof(xfs_sb_t, sb_rbmblocks ) = 92
-offsetof(xfs_sb_t, sb_logblocks ) = 96
-offsetof(xfs_sb_t, sb_versionnum ) = 100
-offsetof(xfs_sb_t, sb_sectsize ) = 102
-offsetof(xfs_sb_t, sb_inodesize ) = 104
-offsetof(xfs_sb_t, sb_inopblock ) = 106
-offsetof(xfs_sb_t, sb_fname[12] ) = 120
-offsetof(xfs_sb_t, sb_blocklog ) = 120
-offsetof(xfs_sb_t, sb_sectlog ) = 121
-offsetof(xfs_sb_t, sb_inodelog ) = 122
-offsetof(xfs_sb_t, sb_inopblog ) = 123
-offsetof(xfs_sb_t, sb_agblklog ) = 124
-offsetof(xfs_sb_t, sb_rextslog ) = 125
-offsetof(xfs_sb_t, sb_inprogress ) = 126
-offsetof(xfs_sb_t, sb_imax_pct ) = 127
-offsetof(xfs_sb_t, sb_icount ) = 128
-offsetof(xfs_sb_t, sb_ifree ) = 136
-offsetof(xfs_sb_t, sb_fdblocks ) = 144
-offsetof(xfs_sb_t, sb_frextents ) = 152
-offsetof(xfs_sb_t, sb_uquotino ) = 160
-offsetof(xfs_sb_t, sb_gquotino ) = 168
-offsetof(xfs_sb_t, sb_qflags ) = 176
-offsetof(xfs_sb_t, sb_flags ) = 178
-offsetof(xfs_sb_t, sb_shared_vn ) = 179
-offsetof(xfs_sb_t, sb_inoalignmt ) = 180
-offsetof(xfs_sb_t, sb_unit ) = 184
-offsetof(xfs_sb_t, sb_width ) = 188
-offsetof(xfs_sb_t, sb_dirblklog ) = 192
-offsetof(xfs_sb_t, sb_logsectlog ) = 193
-offsetof(xfs_sb_t, sb_logsectsize ) = 194
-offsetof(xfs_sb_t, sb_logsunit ) = 196
-offsetof(xfs_sb_t, sb_features2 ) = 200
+sizeof( xfs_trans_reservations_t ) = 84