* [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner @ 2014-12-10 0:14 David Disseldorp 2014-12-10 0:14 ` [PATCH 2/2] cifs: add server-side copy sanity test David Disseldorp 2014-12-10 3:38 ` [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner Steve French 0 siblings, 2 replies; 5+ messages in thread From: David Disseldorp @ 2014-12-10 0:14 UTC (permalink / raw) To: fstests; +Cc: linux-cifs, David Disseldorp src/cloner.c is no longer Btrfs specific, so use a generic name. Signed-off-by: David Disseldorp <ddiss@suse.de> --- common/rc | 2 +- tests/btrfs/035 | 2 +- tests/btrfs/052 | 2 +- tests/btrfs/055 | 2 +- tests/btrfs/056 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/rc b/common/rc index d5e3aff..ea80c77 100644 --- a/common/rc +++ b/common/rc @@ -2367,7 +2367,7 @@ _require_fssum() [ -x $FSSUM_PROG ] || _notrun "fssum not built" } -_require_btrfs_cloner() +_require_cloner() { CLONER_PROG=$here/src/cloner [ -x $CLONER_PROG ] || \ diff --git a/tests/btrfs/035 b/tests/btrfs/035 index dd303af..35ddfce 100755 --- a/tests/btrfs/035 +++ b/tests/btrfs/035 @@ -45,7 +45,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15 _supported_fs btrfs _supported_os Linux _require_scratch -_require_btrfs_cloner +_require_cloner _scratch_mkfs > /dev/null 2>&1 _scratch_mount diff --git a/tests/btrfs/052 b/tests/btrfs/052 index 671034e..c75193d 100755 --- a/tests/btrfs/052 +++ b/tests/btrfs/052 @@ -44,7 +44,7 @@ _cleanup() _supported_fs btrfs _supported_os Linux _require_scratch -_require_btrfs_cloner +_require_cloner _need_to_be_root rm -f $seqres.full diff --git a/tests/btrfs/055 b/tests/btrfs/055 index 10c6040..c0dd9ed 100755 --- a/tests/btrfs/055 +++ b/tests/btrfs/055 @@ -48,7 +48,7 @@ _cleanup() _supported_fs btrfs _supported_os Linux _require_scratch -_require_btrfs_cloner +_require_cloner _require_btrfs_fs_feature "no_holes" _require_btrfs_mkfs_feature "no-holes" _need_to_be_root diff --git a/tests/btrfs/056 b/tests/btrfs/056 index 9ecfeb8..9e9d92b 100755 --- a/tests/btrfs/056 +++ b/tests/btrfs/056 @@ -52,7 +52,7 @@ _cleanup() _supported_fs btrfs _supported_os Linux _require_scratch -_require_btrfs_cloner +_require_cloner _require_btrfs_fs_feature "no_holes" _require_btrfs_mkfs_feature "no-holes" _require_dm_flakey -- 2.1.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] cifs: add server-side copy sanity test 2014-12-10 0:14 [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner David Disseldorp @ 2014-12-10 0:14 ` David Disseldorp 2014-12-15 9:31 ` David Drysdale 2014-12-10 3:38 ` [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner Steve French 1 sibling, 1 reply; 5+ messages in thread From: David Disseldorp @ 2014-12-10 0:14 UTC (permalink / raw) To: fstests; +Cc: linux-cifs, David Disseldorp This test uses the cloner binary to issue CIFS_IOC_COPYCHUNK_FILE server-side copy requests. Signed-off-by: David Disseldorp <ddiss@suse.de> --- tests/cifs/001 | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/cifs/001.out | 21 +++++++++++++++++ tests/cifs/group | 6 +++++ 3 files changed, 96 insertions(+) create mode 100755 tests/cifs/001 create mode 100644 tests/cifs/001.out create mode 100644 tests/cifs/group diff --git a/tests/cifs/001 b/tests/cifs/001 new file mode 100755 index 0000000..57ce728 --- /dev/null +++ b/tests/cifs/001 @@ -0,0 +1,69 @@ +#!/bin/bash +# FS QA Test No. cifs/001 +# +# Sanity test for server-side copies initiated via CIFS_IOC_COPYCHUNK_FILE +# +#----------------------------------------------------------------------- +# Copyright (C) 2014 SUSE Linux Products GmbH. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! + +_cleanup() +{ + rm -f $tmp.* + rm -rf $TEST_DIR/$$ +} + +trap "_cleanup ; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs cifs +_supported_os Linux +_require_cloner +_require_test + +mkdir -p $TEST_DIR/$$/src || _fail "failed to create clone src dir" +mkdir -p $TEST_DIR/$$/dest || _fail "failed to create clone dest dir" + +# populate 10 files, 1K-10K in size +for i in `seq 1 10`; do + len=$(($i * 1024)) + $XFS_IO_PROG -f -c "pwrite -S $i 0 $len" $TEST_DIR/$$/src/${i} \ + | _filter_xfs_io +done +sync + +# clone each, then compare both versions +for i in `seq 1 10`; do + $CLONER_PROG $TEST_DIR/$$/src/${i} $TEST_DIR/$$/dest/${i} + diff $TEST_DIR/$$/src/${i} $TEST_DIR/$$/dest/${i} +done + +status=0 +exit diff --git a/tests/cifs/001.out b/tests/cifs/001.out new file mode 100644 index 0000000..54e2bbe --- /dev/null +++ b/tests/cifs/001.out @@ -0,0 +1,21 @@ +QA output created by 001 +wrote 1024/1024 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 2048/2048 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 3072/3072 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 4096/4096 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 5120/5120 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 6144/6144 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 7168/7168 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 8192/8192 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 9216/9216 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 10240/10240 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/cifs/group b/tests/cifs/group new file mode 100644 index 0000000..6d07b1c --- /dev/null +++ b/tests/cifs/group @@ -0,0 +1,6 @@ +# QA groups control file +# Defines test groups and nominal group owners +# - do not start group names with a digit +# - comment line before each group is "new" description +# +001 auto quick -- 2.1.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] cifs: add server-side copy sanity test 2014-12-10 0:14 ` [PATCH 2/2] cifs: add server-side copy sanity test David Disseldorp @ 2014-12-15 9:31 ` David Drysdale 2014-12-15 10:04 ` David Disseldorp 0 siblings, 1 reply; 5+ messages in thread From: David Drysdale @ 2014-12-15 9:31 UTC (permalink / raw) To: David Disseldorp; +Cc: fstests, linux-cifs On Wed, Dec 10, 2014 at 12:14 AM, David Disseldorp <ddiss@suse.de> wrote: > > This test uses the cloner binary to issue CIFS_IOC_COPYCHUNK_FILE > server-side copy requests. > > Signed-off-by: David Disseldorp <ddiss@suse.de> > --- > tests/cifs/001 | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/cifs/001.out | 21 +++++++++++++++++ > tests/cifs/group | 6 +++++ > 3 files changed, 96 insertions(+) > create mode 100755 tests/cifs/001 > create mode 100644 tests/cifs/001.out > create mode 100644 tests/cifs/group Does this also need a new tests/cifs/Makefile (so that e.g. the install target in tests/Makefile still works)? > diff --git a/tests/cifs/001 b/tests/cifs/001 > new file mode 100755 > index 0000000..57ce728 > --- /dev/null > +++ b/tests/cifs/001 > @@ -0,0 +1,69 @@ > +#!/bin/bash > +# FS QA Test No. cifs/001 > +# > +# Sanity test for server-side copies initiated via CIFS_IOC_COPYCHUNK_FILE > +# > +#----------------------------------------------------------------------- > +# Copyright (C) 2014 SUSE Linux Products GmbH. All Rights Reserved. > +# > +# This program is free software; you can redistribute it and/or > +# modify it under the terms of the GNU General Public License as > +# published by the Free Software Foundation. > +# > +# This program is distributed in the hope that it would be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program; if not, write the Free Software Foundation, > +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > +# > +#----------------------------------------------------------------------- > +# > + > +seq=`basename $0` > +seqres=$RESULT_DIR/$seq > +echo "QA output created by $seq" > + > +here=`pwd` > +tmp=/tmp/$$ > +status=1 # failure is the default! > + > +_cleanup() > +{ > + rm -f $tmp.* > + rm -rf $TEST_DIR/$$ > +} > + > +trap "_cleanup ; exit \$status" 0 1 2 3 15 > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > + > +# real QA test starts here > +_supported_fs cifs > +_supported_os Linux > +_require_cloner > +_require_test > + > +mkdir -p $TEST_DIR/$$/src || _fail "failed to create clone src dir" > +mkdir -p $TEST_DIR/$$/dest || _fail "failed to create clone dest dir" > + > +# populate 10 files, 1K-10K in size > +for i in `seq 1 10`; do > + len=$(($i * 1024)) > + $XFS_IO_PROG -f -c "pwrite -S $i 0 $len" $TEST_DIR/$$/src/${i} \ > + | _filter_xfs_io > +done > +sync > + > +# clone each, then compare both versions > +for i in `seq 1 10`; do > + $CLONER_PROG $TEST_DIR/$$/src/${i} $TEST_DIR/$$/dest/${i} > + diff $TEST_DIR/$$/src/${i} $TEST_DIR/$$/dest/${i} > +done > + > +status=0 > +exit > diff --git a/tests/cifs/001.out b/tests/cifs/001.out > new file mode 100644 > index 0000000..54e2bbe > --- /dev/null > +++ b/tests/cifs/001.out > @@ -0,0 +1,21 @@ > +QA output created by 001 > +wrote 1024/1024 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 2048/2048 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 3072/3072 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 4096/4096 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 5120/5120 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 6144/6144 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 7168/7168 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 8192/8192 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 9216/9216 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 10240/10240 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > diff --git a/tests/cifs/group b/tests/cifs/group > new file mode 100644 > index 0000000..6d07b1c > --- /dev/null > +++ b/tests/cifs/group > @@ -0,0 +1,6 @@ > +# QA groups control file > +# Defines test groups and nominal group owners > +# - do not start group names with a digit > +# - comment line before each group is "new" description > +# > +001 auto quick > -- > 2.1.2 > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] cifs: add server-side copy sanity test 2014-12-15 9:31 ` David Drysdale @ 2014-12-15 10:04 ` David Disseldorp 0 siblings, 0 replies; 5+ messages in thread From: David Disseldorp @ 2014-12-15 10:04 UTC (permalink / raw) To: David Drysdale; +Cc: fstests, linux-cifs On Mon, 15 Dec 2014 09:31:57 +0000, David Drysdale wrote: > > This test uses the cloner binary to issue CIFS_IOC_COPYCHUNK_FILE > > server-side copy requests. > > > > Signed-off-by: David Disseldorp <ddiss@suse.de> > > --- > > tests/cifs/001 | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/cifs/001.out | 21 +++++++++++++++++ > > tests/cifs/group | 6 +++++ > > 3 files changed, 96 insertions(+) > > create mode 100755 tests/cifs/001 > > create mode 100644 tests/cifs/001.out > > create mode 100644 tests/cifs/group > > Does this also need a new tests/cifs/Makefile (so that e.g. the install > target in tests/Makefile still works)? Yes, you're right. Thanks for the feedback. I'll send through a new version with the Makefile. Cheers, David ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner 2014-12-10 0:14 [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner David Disseldorp 2014-12-10 0:14 ` [PATCH 2/2] cifs: add server-side copy sanity test David Disseldorp @ 2014-12-10 3:38 ` Steve French 1 sibling, 0 replies; 5+ messages in thread From: Steve French @ 2014-12-10 3:38 UTC (permalink / raw) To: David Disseldorp; +Cc: fstests, linux-cifs@vger.kernel.org Acked-by: Steve French <smfrench@gmail.com> On Tue, Dec 9, 2014 at 6:14 PM, David Disseldorp <ddiss@suse.de> wrote: > src/cloner.c is no longer Btrfs specific, so use a generic name. > > Signed-off-by: David Disseldorp <ddiss@suse.de> > --- > common/rc | 2 +- > tests/btrfs/035 | 2 +- > tests/btrfs/052 | 2 +- > tests/btrfs/055 | 2 +- > tests/btrfs/056 | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/common/rc b/common/rc > index d5e3aff..ea80c77 100644 > --- a/common/rc > +++ b/common/rc > @@ -2367,7 +2367,7 @@ _require_fssum() > [ -x $FSSUM_PROG ] || _notrun "fssum not built" > } > > -_require_btrfs_cloner() > +_require_cloner() > { > CLONER_PROG=$here/src/cloner > [ -x $CLONER_PROG ] || \ > diff --git a/tests/btrfs/035 b/tests/btrfs/035 > index dd303af..35ddfce 100755 > --- a/tests/btrfs/035 > +++ b/tests/btrfs/035 > @@ -45,7 +45,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15 > _supported_fs btrfs > _supported_os Linux > _require_scratch > -_require_btrfs_cloner > +_require_cloner > > _scratch_mkfs > /dev/null 2>&1 > _scratch_mount > diff --git a/tests/btrfs/052 b/tests/btrfs/052 > index 671034e..c75193d 100755 > --- a/tests/btrfs/052 > +++ b/tests/btrfs/052 > @@ -44,7 +44,7 @@ _cleanup() > _supported_fs btrfs > _supported_os Linux > _require_scratch > -_require_btrfs_cloner > +_require_cloner > _need_to_be_root > > rm -f $seqres.full > diff --git a/tests/btrfs/055 b/tests/btrfs/055 > index 10c6040..c0dd9ed 100755 > --- a/tests/btrfs/055 > +++ b/tests/btrfs/055 > @@ -48,7 +48,7 @@ _cleanup() > _supported_fs btrfs > _supported_os Linux > _require_scratch > -_require_btrfs_cloner > +_require_cloner > _require_btrfs_fs_feature "no_holes" > _require_btrfs_mkfs_feature "no-holes" > _need_to_be_root > diff --git a/tests/btrfs/056 b/tests/btrfs/056 > index 9ecfeb8..9e9d92b 100755 > --- a/tests/btrfs/056 > +++ b/tests/btrfs/056 > @@ -52,7 +52,7 @@ _cleanup() > _supported_fs btrfs > _supported_os Linux > _require_scratch > -_require_btrfs_cloner > +_require_cloner > _require_btrfs_fs_feature "no_holes" > _require_btrfs_mkfs_feature "no-holes" > _require_dm_flakey > -- > 2.1.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Thanks, Steve ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-12-15 10:04 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-12-10 0:14 [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner David Disseldorp 2014-12-10 0:14 ` [PATCH 2/2] cifs: add server-side copy sanity test David Disseldorp 2014-12-15 9:31 ` David Drysdale 2014-12-15 10:04 ` David Disseldorp 2014-12-10 3:38 ` [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner Steve French
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox