From patchwork Fri Aug 24 01:41:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 1369541 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 93CCD3FCAE for ; Fri, 24 Aug 2012 01:42:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754362Ab2HXBl7 (ORCPT ); Thu, 23 Aug 2012 21:41:59 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:35136 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752133Ab2HXBl6 (ORCPT ); Thu, 23 Aug 2012 21:41:58 -0400 X-IronPort-AV: E=Sophos;i="4.77,817,1336320000"; d="scan'208";a="5710003" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 24 Aug 2012 09:40:50 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q7O1ft21002114; Fri, 24 Aug 2012 09:41:56 +0800 Received: from [10.167.225.199] ([10.167.225.199]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012082409415300-473407 ; Fri, 24 Aug 2012 09:41:53 +0800 Message-ID: <5036DBC8.9000207@cn.fujitsu.com> Date: Fri, 24 Aug 2012 09:41:28 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120605 Thunderbird/13.0 MIME-Version: 1.0 To: Linux Btrfs , xfs@oss.sgi.com CC: anand.jain@oracle.com Subject: [PATCH 1/3] xfstests: fix interference output of the balance program in case 265 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/24 09:41:53, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/24 09:41:54, Serialize complete at 2012/08/24 09:41:54 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The balance program of btrfs outputs the result after it is done, but it will make the test program fail because the test program thinks it is not the expected result. So we just throw that information away to fix this problem. Signed-off-by: Miao Xie --- 265 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/265 b/265 index 10f214f..ec8410c 100755 --- a/265 +++ b/265 @@ -110,7 +110,7 @@ _test_add() for i in `seq 1 $n`; do btrfs device add ${devs[$i]} $SCRATCH_MNT > /dev/null 2>&1 || _fail "device add failed" done - btrfs filesystem balance $SCRATCH_MNT || _fail "balance failed" + btrfs filesystem balance $SCRATCH_MNT 1> /dev/null || _fail "balance failed" umount $SCRATCH_MNT } @@ -153,7 +153,7 @@ _test_replace() # in some system balance fails if there is no delay (a bug) # putting sleep 10 to work around as of now # sleep 10 - btrfs fi balance $SCRATCH_MNT || _fail "dev balance failed" + btrfs fi balance $SCRATCH_MNT 1> /dev/null || _fail "dev balance failed" # cleaup. add the removed disk umount $SCRATCH_MNT