From patchwork Sun Mar 24 12:14:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 230437 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 87F7D2C008D for ; Sun, 24 Mar 2013 22:58:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753388Ab3CXL66 (ORCPT ); Sun, 24 Mar 2013 07:58:58 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:46487 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753363Ab3CXL65 (ORCPT ); Sun, 24 Mar 2013 07:58:57 -0400 Received: by mail-pb0-f41.google.com with SMTP id mc8so375577pbc.14 for ; Sun, 24 Mar 2013 04:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=GDqgYEHiSEQsomxwBLyKJKDsAu9HQ94baXzZuI7bF+U=; b=WHnipndg85P14qaRy2QDqXqTDuzCwVuKPQ9Lp7HzAKhANY0oO7VsP/s8WFadXieURq TrPo8RFGI+SFE4mWlUOyp3E424fZ6slkIdah5GdUq8mzbEcmq2N8J7t9ETtWQpsorLHy 7FyWA7fCZOKNvMUnXSky/FTOu6avUM05GiK1OD/KnBUrdD/R0bp3jwzqg7q0/YPm6O+0 /Kltlbcos8SMfqFBKKNeIo9Qny8o0dn+1clJxlyHBQGRo/hfVU2CzViXmLV5Sp23tz21 ArfaXTbNqjRqqOBhmJkQ3HqBciuKvC22TzMDD4vXNXPArq24vzPOAuI+bMiz/Cd5O5Gq X/5w== X-Received: by 10.66.197.197 with SMTP id iw5mr12730062pac.89.1364126337404; Sun, 24 Mar 2013 04:58:57 -0700 (PDT) Received: from lz-desktop.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPS id 1sm9414981pba.32.2013.03.24.04.58.51 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 24 Mar 2013 04:58:56 -0700 (PDT) From: Zheng Liu To: xfs@oss.sgi.com Cc: linux-ext4@vger.kernel.org, Zheng Liu , Eric Sandeen , Dave Chinner Subject: [PATCH v2] xfstests 299-305: remove fio config files after finished test Date: Sun, 24 Mar 2013 20:14:26 +0800 Message-Id: <1364127266-13325-1-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu After finished test, temporarily fio config file should be removed. Meanwhile in #305 poweron_scratch_dev is removed because no one uses it. Signed-off-by: Zheng Liu Cc: Eric Sandeen Cc: Dave Chinner --- 299 | 9 +++++---- 300 | 9 +++++---- 301 | 9 +++++---- 302 | 9 +++++---- 303 | 9 +++++---- 304 | 9 +++++---- 305 | 11 ++++++----- 7 files changed, 36 insertions(+), 29 deletions(-) mode change 100644 => 100755 299 mode change 100644 => 100755 300 mode change 100644 => 100755 301 mode change 100644 => 100755 302 mode change 100644 => 100755 303 mode change 100644 => 100755 304 mode change 100644 => 100755 305 diff --git a/299 b/299 old mode 100644 new mode 100755 index 4305ead..20bef89 --- a/299 +++ b/299 @@ -31,6 +31,7 @@ echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ +fio_config=$tmp.fio status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 @@ -48,7 +49,7 @@ NUM_JOBS=$((4*LOAD_FACTOR)) BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` FILE_SIZE=$((BLK_DEV_SIZE * 512)) -cat >$tmp-$seq.fio <$fio_config <> $seq.full - run_check $FIO_PROG $tmp-$seq.fio & + cat $fio_config >> $seq.full + run_check $FIO_PROG $fio_config & pid=$! echo "Start fallocate/truncate loop" diff --git a/300 b/300 old mode 100644 new mode 100755 index 73c9ea7..54349c0 --- a/300 +++ b/300 @@ -31,6 +31,7 @@ echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ +fio_config=$tmp.fio status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 @@ -52,7 +53,7 @@ then fi FS_SIZE=$((BLK_DEV_SIZE * 512)) -cat >$tmp-$seq.fio <$fio_config <> $seq.full - run_check $FIO_PROG $tmp-$seq.fio + cat $fio_config >> $seq.full + run_check $FIO_PROG $fio_config } -_require_fio $tmp-$seq.fio +_require_fio $fio_config _scratch_mkfs_sized $FS_SIZE >> $seq.full 2>&1 _scratch_mount diff --git a/301 b/301 old mode 100644 new mode 100755 index fe2e59f..280fd02 --- a/301 +++ b/301 @@ -29,6 +29,7 @@ echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ +fio_config=$tmp.fio status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 @@ -50,7 +51,7 @@ BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` # reserve 30% in order to avoid ENOSPC FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1)))) -cat >$tmp-$seq.fio <$fio_config <> $seq.full - run_check $FIO_PROG $tmp-$seq.fio + cat $fio_config >> $seq.full + run_check $FIO_PROG $fio_config } -_require_fio $tmp-$seq.fio +_require_fio $fio_config _scratch_mkfs >> $seq.full 2>&1 _scratch_mount diff --git a/302 b/302 old mode 100644 new mode 100755 index e3dceb8..6a987ad --- a/302 +++ b/302 @@ -30,6 +30,7 @@ echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ +fio_config=$tmp.fio status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 @@ -50,7 +51,7 @@ BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` # reserve 30% in order to avoid ENOSPC FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1)))) -cat >$tmp-$seq.fio <$fio_config <> $seq.full - run_check $FIO_PROG $tmp-$seq.fio + cat $fio_config >> $seq.full + run_check $FIO_PROG $fio_config } -_require_fio $tmp-$seq.fio +_require_fio $fio_config _scratch_mkfs >> $seq.full 2>&1 _scratch_mount diff --git a/303 b/303 old mode 100644 new mode 100755 index 4141442..8af56b3 --- a/303 +++ b/303 @@ -30,6 +30,7 @@ echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ +fio_config=$tmp.fio status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 @@ -50,7 +51,7 @@ BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` # Reserve space for 4 files in order to avoid ENOSPC FILE_SIZE=$((BLK_DEV_SIZE * (512 / (3+1)))) -cat >$tmp-$seq.fio <$fio_config <> $seq.full - run_check $FIO_PROG $tmp-$seq.fio + cat $fio_config >> $seq.full + run_check $FIO_PROG $fio_config } -_require_fio $tmp-$seq.fio +_require_fio $fio_config _scratch_mkfs >> $seq.full 2>&1 _scratch_mount diff --git a/304 b/304 old mode 100644 new mode 100755 index 5c414bd..45b9e2b --- a/304 +++ b/304 @@ -31,6 +31,7 @@ echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ +fio_config=$tmp.fio status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 @@ -51,7 +52,7 @@ BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` # reserve 30% in order to avoid ENOSPC FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1)))) -cat >$tmp-$seq.fio <$fio_config <> $seq.full - run_check $FIO_PROG $tmp-$seq.fio + cat $fio_config >> $seq.full + run_check $FIO_PROG $fio_config } -_require_fio $tmp-$seq.fio +_require_fio $fio_config _scratch_mkfs >> $seq.full 2>&1 _scratch_mount diff --git a/305 b/305 old mode 100644 new mode 100755 index 6393461..7e5b1a2 --- a/305 +++ b/305 @@ -30,6 +30,7 @@ echo "QA output created by $seq" here=`pwd` tmp=/tmp/$$ +fio_config=$tmp.fio status=1 # failure is the default! # get standard environment, filters and checks @@ -78,8 +79,8 @@ stop_fail_scratch_dev() _cleanup() { - poweron_scratch_dev disallow_fail_make_request + rm -f $tmp.* } trap "_cleanup; exit \$status" 1 2 3 15 @@ -88,7 +89,7 @@ NUM_JOBS=$((4*LOAD_FACTOR)) BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` FILE_SIZE=$((BLK_DEV_SIZE * 512)) -cat >$tmp-$seq.fio <$fio_config < /dev/null 2>&1 & fs_pid=$! echo "Start fio.." - cat $tmp-$seq.fio >> $seq.full - $FIO_PROG $tmp-$seq.fio >> $here/$seq.full 2>&1 & + cat $fio_config >> $seq.full + $FIO_PROG $fio_config >> $here/$seq.full 2>&1 & fio_pid=$! # Let's it work for awhile, and force device failure