From patchwork Tue Jan 28 18:40:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 3547631 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE649C02DC for ; Tue, 28 Jan 2014 18:40:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDB2020170 for ; Tue, 28 Jan 2014 18:40:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02A8520123 for ; Tue, 28 Jan 2014 18:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755261AbaA1Skl (ORCPT ); Tue, 28 Jan 2014 13:40:41 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:15330 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754970AbaA1Skk (ORCPT ); Tue, 28 Jan 2014 13:40:40 -0500 Received: from pps.filterd (m0004003 [127.0.0.1]) by mx0b-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id s0SIceji004462; Tue, 28 Jan 2014 10:40:38 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : mime-version : content-type; s=facebook; bh=cTykMkAnGYA2xpWuATldeh4Zm4KpAIsWosPanVWTTbo=; b=MQ82qKwi2SEc4WftFjjTqJC/tMnB2I0NTByWu0DHNhIdMvH/KUR7GLky9zXNQO2Ss7Gu aIN8ymvAIvFzsW/FS+kJAblFE/sM3RD5KqJeJGI1LuqluqU4d9xLR2eSo6PedWDV5GP9 jn4rPU2/Uu3V95LUTY9cNIt3ZFuUSQdhqw4= Received: from mail.thefacebook.com (mailwest.thefacebook.com [173.252.71.148]) by mx0b-00082601.pphosted.com with ESMTP id 1hphp182pu-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=OK); Tue, 28 Jan 2014 10:40:37 -0800 Received: from localhost (192.168.57.29) by mail.TheFacebook.com (192.168.16.17) with Microsoft SMTP Server (TLS) id 14.3.174.1; Tue, 28 Jan 2014 10:40:35 -0800 From: Josef Bacik To: , Subject: [PATCH] xfstests: change btrfs/029's golden output and it's filtering Date: Tue, 28 Jan 2014 13:40:33 -0500 Message-ID: <1390934433-22299-1-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [192.168.57.29] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.11.87, 1.0.14, 0.0.0000 definitions=2014-01-28_07:2014-01-28, 2014-01-28, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=9.18634911251104e-07 kscore.compositescore=0 circleOfTrustscore=214.586322024494 compositescore=0.999738115633958 urlsuspect_oldscore=0.999738115633958 suspectscore=0 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=64355 rbsscore=0.999738115633958 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1305240000 definitions=main-1401280112 X-FB-Internal: deliver Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I noticed while testing a different mkfs option that btrfs/029 was failing because it was getting the extra output from our mkfs.btrfs. After I fixed that I was still failing because my version of cp will spit out the source and destination files, not just the destination file. So redirect _scratch_mkfs to /dev/null like everybody does and make the golden output just expect to see "cp failed" instead of the cp specific output. Thanks, Signed-off-by: Josef Bacik --- tests/btrfs/029 | 6 +++--- tests/btrfs/029.out | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/btrfs/029 b/tests/btrfs/029 index b93b6df..80c05e3 100644 --- a/tests/btrfs/029 +++ b/tests/btrfs/029 @@ -66,7 +66,7 @@ mkdir $SOURCE_DIR rm -f $seqres.full -_scratch_mkfs +_scratch_mkfs > /dev/null 2>&1 $XFS_IO_PROG -f -c 'pwrite -S 0x61 0 9000' $SOURCE_DIR/original \ >> $seqres.full @@ -87,8 +87,8 @@ _create_reflinks_to() # always reflink, should fail outright rm -rf $1; mkdir $1 echo "reflink=always:" - cp --reflink=always $SOURCE_DIR/original $1/copyfail \ - 2>&1 | _filter_testdirs + cp --reflink=always $SOURCE_DIR/original $1/copyfail > $seqres.full 2>&1 \ + || echo "cp reflink failed" # The failed target actually gets created by cp: ls $1/copyfail | _filter_testdirs diff --git a/tests/btrfs/029.out b/tests/btrfs/029.out index 655c081..9390d95 100644 --- a/tests/btrfs/029.out +++ b/tests/btrfs/029.out @@ -4,12 +4,12 @@ reflink=auto: 42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-029/original 42d69d1a6d333a7ebdf64792a555e392 SCRATCH_MNT/test-029/copy reflink=always: -cp: failed to clone 'SCRATCH_MNT/test-029/copyfail': Invalid cross-device link +cp reflink failed SCRATCH_MNT/test-029/copyfail test reflinks across different mountpoints of same device reflink=auto: 42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-029/original 42d69d1a6d333a7ebdf64792a555e392 SCRATCH_MNT/test-bis-029/copy reflink=always: -cp: failed to clone 'SCRATCH_MNT/test-bis-029/copyfail': Invalid cross-device link +cp reflink failed SCRATCH_MNT/test-bis-029/copyfail