From: "Darrick J. Wong" <darrick.wong@oracle.com> To: david@fromorbit.com Cc: Xiao Yang <yangx.jy@cn.fujitsu.com>, fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, xfs@oss.sgi.com, hch@infradead.org Subject: [PATCH v2 8/7] xfs/122: don't break on old xfsprogs Date: Tue, 31 May 2016 09:43:52 -0700 [thread overview] Message-ID: <20160531164352.GC5053@birch.djwong.org> (raw) In-Reply-To: <20160527180231.GB5050@birch.djwong.org> If we're running against a old version of xfsprogs that lacks some of the structures that the golden output knows about, copy the structure size definition from the golden output to the program output. This way we can check for structure size mutations on old xfsprogs without generating false error reports for structs that don't exist in the old release. v2: Remove the xfsprogs 2.9.8 compatibility cruft. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- tests/xfs/122 | 17 ++++++----------- tests/xfs/122.out | 1 + 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/xfs/122 b/tests/xfs/122 index 845cdd2..330d3ac 100755 --- a/tests/xfs/122 +++ b/tests/xfs/122 @@ -73,6 +73,7 @@ _attribute_filter() cprog=$tmp.get_structs.c oprog=$tmp.get_structs progout=$tmp.output +keyfile=$tmp.keys cat >$cprog <<EOF #define _GNU_SOURCE @@ -226,18 +227,12 @@ cc -o $oprog $cprog >> $seqres.full 2>&1 || \ _notrun "Could not compile test program (see end of $seqres.full)" $oprog | _type_size_filter | _type_name_filter > $progout -# -# add addition sizes and xfs_sb_t fields that don't exist in the version -# being tested. -# +# Find all the items that only exist in the golden output +comm -23 <(grep '=' $0.out | sed -e 's/ =.*$//g' | LC_COLLATE=POSIX sort) \ + <(sed -e 's/ =.*$//g' < $progout | LC_COLLATE=POSIX sort) > $keyfile -# xfsprogs 2.9.8: sb_bad_features2 in pv 978822 -if [ $XFSPROGS_VERSION -lt 20908 ]; then - echo 'offsetof(xfs_sb_t, sb_bad_features2 ) = 204' >>$progout -fi -if [ $XFSPROGS_VERSION -lt 30000 ]; then - echo 'sizeof( xfs_dsb_t ) = 208' >>$progout; -fi +# Copy those items to the program output +grep -F -f $keyfile $0.out >> $progout LC_COLLATE=POSIX sort $progout diff --git a/tests/xfs/122.out b/tests/xfs/122.out index 451871e..46d1dd4 100644 --- a/tests/xfs/122.out +++ b/tests/xfs/122.out @@ -147,3 +147,4 @@ sizeof(xfs_lookup_t) = 4 sizeof(xfs_qoff_logformat_t) = 20 sizeof(xfs_timestamp_t) = 8 sizeof(xfs_trans_header_t) = 16 +sizeof(xfs_zzzz_test_the_test_program) = -47
WARNING: multiple messages have this Message-ID (diff)
From: "Darrick J. Wong" <darrick.wong@oracle.com> To: david@fromorbit.com Cc: hch@infradead.org, linux-btrfs@vger.kernel.org, Xiao Yang <yangx.jy@cn.fujitsu.com>, fstests@vger.kernel.org, xfs@oss.sgi.com Subject: [PATCH v2 8/7] xfs/122: don't break on old xfsprogs Date: Tue, 31 May 2016 09:43:52 -0700 [thread overview] Message-ID: <20160531164352.GC5053@birch.djwong.org> (raw) In-Reply-To: <20160527180231.GB5050@birch.djwong.org> If we're running against a old version of xfsprogs that lacks some of the structures that the golden output knows about, copy the structure size definition from the golden output to the program output. This way we can check for structure size mutations on old xfsprogs without generating false error reports for structs that don't exist in the old release. v2: Remove the xfsprogs 2.9.8 compatibility cruft. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- tests/xfs/122 | 17 ++++++----------- tests/xfs/122.out | 1 + 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/xfs/122 b/tests/xfs/122 index 845cdd2..330d3ac 100755 --- a/tests/xfs/122 +++ b/tests/xfs/122 @@ -73,6 +73,7 @@ _attribute_filter() cprog=$tmp.get_structs.c oprog=$tmp.get_structs progout=$tmp.output +keyfile=$tmp.keys cat >$cprog <<EOF #define _GNU_SOURCE @@ -226,18 +227,12 @@ cc -o $oprog $cprog >> $seqres.full 2>&1 || \ _notrun "Could not compile test program (see end of $seqres.full)" $oprog | _type_size_filter | _type_name_filter > $progout -# -# add addition sizes and xfs_sb_t fields that don't exist in the version -# being tested. -# +# Find all the items that only exist in the golden output +comm -23 <(grep '=' $0.out | sed -e 's/ =.*$//g' | LC_COLLATE=POSIX sort) \ + <(sed -e 's/ =.*$//g' < $progout | LC_COLLATE=POSIX sort) > $keyfile -# xfsprogs 2.9.8: sb_bad_features2 in pv 978822 -if [ $XFSPROGS_VERSION -lt 20908 ]; then - echo 'offsetof(xfs_sb_t, sb_bad_features2 ) = 204' >>$progout -fi -if [ $XFSPROGS_VERSION -lt 30000 ]; then - echo 'sizeof( xfs_dsb_t ) = 208' >>$progout; -fi +# Copy those items to the program output +grep -F -f $keyfile $0.out >> $progout LC_COLLATE=POSIX sort $progout diff --git a/tests/xfs/122.out b/tests/xfs/122.out index 451871e..46d1dd4 100644 --- a/tests/xfs/122.out +++ b/tests/xfs/122.out @@ -147,3 +147,4 @@ sizeof(xfs_lookup_t) = 4 sizeof(xfs_qoff_logformat_t) = 20 sizeof(xfs_timestamp_t) = 8 sizeof(xfs_trans_header_t) = 16 +sizeof(xfs_zzzz_test_the_test_program) = -47 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-05-31 16:44 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-26 5:57 [PATCH 0/7] xfstests: minor fixes for the reflink/dedupe tests Darrick J. Wong 2016-05-26 5:57 ` Darrick J. Wong 2016-05-26 5:57 ` [PATCH 1/7] xfs/104: don't enospc when ag metadata overhead grows Darrick J. Wong 2016-05-26 5:57 ` Darrick J. Wong 2016-05-26 8:08 ` Christoph Hellwig 2016-05-26 8:08 ` Christoph Hellwig 2016-05-26 5:57 ` [PATCH 2/7] tests: don't put loop control files on the scratch mount Darrick J. Wong 2016-05-26 5:57 ` Darrick J. Wong 2016-05-26 8:09 ` Christoph Hellwig 2016-05-26 8:09 ` Christoph Hellwig 2016-05-26 16:07 ` Darrick J. Wong 2016-05-26 16:07 ` Darrick J. Wong 2016-05-27 3:28 ` [PATCH v2 " Darrick J. Wong 2016-05-27 3:28 ` Darrick J. Wong 2016-05-31 12:52 ` Christoph Hellwig 2016-05-31 12:52 ` Christoph Hellwig 2016-05-26 5:57 ` [PATCH 3/7] xfs: test copy-on-write leftover recovery Darrick J. Wong 2016-05-26 5:57 ` Darrick J. Wong 2016-05-26 8:22 ` Christoph Hellwig 2016-05-26 8:22 ` Christoph Hellwig 2016-05-26 5:57 ` [PATCH 4/7] xfs: test per-ag allocation accounting during truncate-caused refcountbt expansion Darrick J. Wong 2016-05-26 5:57 ` Darrick J. Wong 2016-05-26 8:23 ` Christoph Hellwig 2016-05-26 8:23 ` Christoph Hellwig 2016-05-26 5:57 ` [PATCH 5/7] reflink: test interaction with swap files Darrick J. Wong 2016-05-26 5:57 ` Darrick J. Wong 2016-05-26 8:24 ` Christoph Hellwig 2016-05-26 8:24 ` Christoph Hellwig 2016-05-26 5:57 ` [PATCH 6/7] xfs: test rmap behavior when multiple bmbt records map to a single rmapbt record Darrick J. Wong 2016-05-26 5:57 ` Darrick J. Wong 2016-05-26 8:04 ` Christoph Hellwig 2016-05-26 8:04 ` Christoph Hellwig 2016-05-26 16:12 ` Darrick J. Wong 2016-05-26 16:12 ` Darrick J. Wong 2016-05-27 3:28 ` [PATCH v2 " Darrick J. Wong 2016-05-27 3:28 ` Darrick J. Wong 2016-05-31 12:52 ` Christoph Hellwig 2016-05-31 12:52 ` Christoph Hellwig 2016-05-26 5:57 ` [PATCH 7/7] reflink: test changing sharers of a block while keeping refcount the same Darrick J. Wong 2016-05-26 5:57 ` Darrick J. Wong 2016-05-26 8:24 ` Christoph Hellwig 2016-05-26 8:24 ` Christoph Hellwig 2016-05-26 7:31 ` question about xfs/122 Xiao Yang 2016-05-26 16:32 ` Darrick J. Wong 2016-05-27 6:33 ` [PATCH] xfs/122: add check number of structure Xiao Yang 2016-05-27 7:28 ` Darrick J. Wong 2016-05-27 7:17 ` [PATCH] xfs/122: filter out reflink and rmap related outputs Xiao Yang 2016-05-27 8:00 ` [PATCH] xfs/122: add check number of structure Xiao Yang 2016-05-27 6:44 ` question about xfs/122 Xiao Yang 2016-05-27 18:02 ` [PATCH 8/7] xfs/122: don't break on old xfsprogs Darrick J. Wong 2016-05-27 18:02 ` Darrick J. Wong 2016-05-31 12:51 ` Christoph Hellwig 2016-05-31 12:51 ` Christoph Hellwig 2016-05-31 16:41 ` Darrick J. Wong 2016-05-31 16:41 ` Darrick J. Wong 2016-05-31 16:43 ` Darrick J. Wong [this message] 2016-05-31 16:43 ` [PATCH v2 " Darrick J. Wong 2016-05-31 19:33 ` Christoph Hellwig 2016-05-31 19:33 ` Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160531164352.GC5053@birch.djwong.org \ --to=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=fstests@vger.kernel.org \ --cc=hch@infradead.org \ --cc=linux-btrfs@vger.kernel.org \ --cc=xfs@oss.sgi.com \ --cc=yangx.jy@cn.fujitsu.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.