From patchwork Wed Oct 10 23:55:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Iliopoulos X-Patchwork-Id: 10635463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2AB0217E3 for ; Wed, 10 Oct 2018 23:56:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E67E2A56C for ; Wed, 10 Oct 2018 23:56:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02C892ABEE; Wed, 10 Oct 2018 23:56:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FADB2A56C for ; Wed, 10 Oct 2018 23:56:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726376AbeJKHUb (ORCPT ); Thu, 11 Oct 2018 03:20:31 -0400 Received: from mx2.suse.de ([195.135.220.15]:33006 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726047AbeJKHUb (ORCPT ); Thu, 11 Oct 2018 03:20:31 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 3858FB0B2 for ; Wed, 10 Oct 2018 23:56:00 +0000 (UTC) From: Anthony Iliopoulos To: fstests@vger.kernel.org Cc: Anthony Iliopoulos Subject: [PATCH] common/reflink: fix error messages in _require_scratch_dedupe() Date: Thu, 11 Oct 2018 01:55:50 +0200 Message-Id: <20181010235550.18742-1-ailiopoulos@suse.com> X-Mailer: git-send-email 2.12.3 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case dedupe returns an error in _require_scratch_dedupe(), report the error for the scratch rather than for the test filesystem. Signed-off-by: Anthony Iliopoulos --- common/reflink | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/reflink b/common/reflink index e2663277..11561a76 100644 --- a/common/reflink +++ b/common/reflink @@ -145,11 +145,11 @@ _require_scratch_dedupe() $XFS_IO_PROG -f -c "pwrite -S 0x61 0 65536" "$SCRATCH_MNT/file2" > /dev/null testio="$($XFS_IO_PROG -f -c "dedupe $SCRATCH_MNT/file1 0 0 65536" "$SCRATCH_MNT/file2" 2>&1)" echo $testio | grep -q "Operation not supported" && \ - _notrun "Dedupe not supported by test filesystem type: $FSTYP" + _notrun "Dedupe not supported by scratch filesystem type: $FSTYP" echo $testio | grep -q "Inappropriate ioctl for device" && \ - _notrun "Dedupe not supported by test filesystem type: $FSTYP" + _notrun "Dedupe not supported by scratch filesystem type: $FSTYP" echo $testio | grep -q "Invalid argument" && \ - _notrun "Dedupe not supported by test filesystem type: $FSTYP" + _notrun "Dedupe not supported by scratch filesystem type: $FSTYP" _scratch_unmount }