From patchwork Tue Sep 22 16:58:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 7241441 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 35EDCBEEC1 for ; Tue, 22 Sep 2015 17:01:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 55EE8208EE for ; Tue, 22 Sep 2015 17:01:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A2162082B for ; Tue, 22 Sep 2015 17:01:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756872AbbIVRAm (ORCPT ); Tue, 22 Sep 2015 13:00:42 -0400 Received: from mail.kernel.org ([198.145.29.136]:57417 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751670AbbIVRAj (ORCPT ); Tue, 22 Sep 2015 13:00:39 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6112208FB; Tue, 22 Sep 2015 17:00:38 +0000 (UTC) Received: from debian3.lan (bl8-199-62.dsl.telepac.pt [85.241.199.62]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E7C820826; Tue, 22 Sep 2015 17:00:37 +0000 (UTC) From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH] fstests: Fix golden output for the new btrfs device replace tests Date: Tue, 22 Sep 2015 17:58:53 +0100 Message-Id: <1442941133-14482-1-git-send-email-fdmanana@kernel.org> X-Mailer: git-send-email 2.1.3 X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Filipe Manana As a workaround for a regression in the uuid filter introduced by a092363bbdfa ("xfs: test changing UUID on V5 superblock"), the btrfs 100 and 101 tests included an extra white space before the uuid in their golden output files. However commit 48613832ad11 ("_filter_uuid: Fix output regression for btrfs/006"), which came later, fixed the regression in the uuid filter therefore making btrfs/100 and btrfs/101 fail due to the extra space in their expected golden output files. So just remove the extra white spaces from the golden output files. $ ./check btrfs/100 FSTYP -- btrfs PLATFORM -- Linux/x86_64 debian3 4.2.0-rc5-btrfs-next-13+ MKFS_OPTIONS -- /dev/sdc MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1 btrfs/100 4s ... - output mismatch (see .../results//btrfs/100.out.bad) --- tests/btrfs/100.out 2015-09-22 02:56:35.031470334 +0100 +++ /home/fdmanana/git/hub/xfstests/results//btrfs/100.out.bad... @@ -1,10 +1,10 @@ QA output created by 100 -Label: none uuid: +Label: none uuid: Total devices FS bytes used devid size used path SCRATCH_DEV devid size used path /dev/mapper/error-test (...) Failures: btrfs/100 Failed 1 of 1 tests Signed-off-by: Filipe Manana --- tests/btrfs/100.out | 4 ++-- tests/btrfs/101.out | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/btrfs/100.out b/tests/btrfs/100.out index 2eeefa4..aa49291 100644 --- a/tests/btrfs/100.out +++ b/tests/btrfs/100.out @@ -1,10 +1,10 @@ QA output created by 100 -Label: none uuid: +Label: none uuid: Total devices FS bytes used devid size used path SCRATCH_DEV devid size used path /dev/mapper/error-test -Label: none uuid: +Label: none uuid: Total devices FS bytes used devid size used path SCRATCH_DEV diff --git a/tests/btrfs/101.out b/tests/btrfs/101.out index 4621902..e1b88c2 100644 --- a/tests/btrfs/101.out +++ b/tests/btrfs/101.out @@ -1,10 +1,10 @@ QA output created by 101 -Label: none uuid: +Label: none uuid: Total devices FS bytes used devid size used path SCRATCH_DEV devid size used path /dev/mapper/error-test -Label: none uuid: +Label: none uuid: Total devices FS bytes used devid size used path SCRATCH_DEV