From patchwork Wed Nov 24 15:17:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 12637077 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE5B1C433EF for ; Wed, 24 Nov 2021 15:17:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233505AbhKXPU4 (ORCPT ); Wed, 24 Nov 2021 10:20:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230422AbhKXPUy (ORCPT ); Wed, 24 Nov 2021 10:20:54 -0500 Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DA92C061574 for ; Wed, 24 Nov 2021 07:17:44 -0800 (PST) Received: by mail-qk1-x72a.google.com with SMTP id b67so3151375qkg.6 for ; Wed, 24 Nov 2021 07:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=jJMnl51hQ0OwhZ0gFTr7o3/duIRSwAy8JZ2VpMbFu4w=; b=H33OD67+XM2JUi4W2SrkckZmmOnXzHfAGnjDrE+tm0Tj7Rvy4OithnDSQi5E7NjUk7 2hWuPsFodiLqUCebeZuusev3V3r716qlKe0JqPkag4J0xy9ax4Nj+9MaYHWRbra6HugK hnpGwQI0kf1bi+kUHQrSWViO+phpfweeOLAJAeuCkryfRSfsFOYo0kxFkGJMxgq5K8+y effUKyv7LOnblTfcso0B2ZKs+Fk9q6piZ1eMuyef2eXooAV7JQEm9bhCocI0LjoDS3Ix Y5peFhY7IuHPtGZhO32Xh6Y/o0qlZ9HYh/e5fsATORs1Jjq0qTc3XF29ZiDxhQjShCH6 q7NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=jJMnl51hQ0OwhZ0gFTr7o3/duIRSwAy8JZ2VpMbFu4w=; b=DJPUDkEGnDOx6RANXU+iN3QPZvW5wQN0lA7fWWoIG/yiZGwo8XGXjENOFM32RMIMSX Y0HVUIvZYUjs7U55ifIpI/TNcyDRt88bH/bfbiR6aroouRARbBa2Z5ftx4BNqZywzb3W 18dQmOeygU7iKGE8wUj6uTNm7Aw2MNexArjGFKOTAX/r13iOYvYWLT8VX3lTOOSDFDCg Z/K9p9L/DBhhXRUuzDxPNJ0tXSZsfDTTsf2MJk0jSM6Lur5PKASOlxIAFE3w26l+dKtK UqaZZvX4/+zABGFGMljANiig5yU7L5ppyGh9oqYNFi4bwCk6wdes4smbgRQoMgWPdXZU FKOw== X-Gm-Message-State: AOAM533WhxPNwcU1Y9T5ZmVDYbVUjR8X88KyBZ1X8QkWUOrU1RQ0dRp2 R7Ur3ksni9SWdRryjttPKazB93Ixo6Z5RQ== X-Google-Smtp-Source: ABdhPJy3h2Z7ck2vWkvPS3yAWIakp+2IWlSXBfpkkWSpcet2rXGoC+AyUyI6iRN59zlVVoqPME7qww== X-Received: by 2002:a37:f619:: with SMTP id y25mr6712621qkj.201.1637767063006; Wed, 24 Nov 2021 07:17:43 -0800 (PST) Received: from localhost (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id c3sm9158qkp.47.2021.11.24.07.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 07:17:41 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, kernel-team@fb.com Subject: [PATCH] fstests: btrfs/176: redirect _format_swapfile to null Date: Wed, 24 Nov 2021 10:17:40 -0500 Message-Id: X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Since bb0ab7b2 ("common/rc: Enable _format_swapfile to return the swap size") we started echo'ing out the swap file size, which is polluting the golden output for btrfs/176 causing it to fail. Fix this by redirecting the output to /dev/null. Signed-off-by: Josef Bacik --- tests/btrfs/176 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/btrfs/176 b/tests/btrfs/176 index 4cd510b6..33f9a061 100755 --- a/tests/btrfs/176 +++ b/tests/btrfs/176 @@ -47,7 +47,7 @@ _check_scratch_fs "$scratch_dev2" echo "Replace device" _scratch_mkfs >> $seqres.full 2>&1 _scratch_mount -_format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) +_format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) > /dev/null $BTRFS_UTIL_PROG device add -f "$scratch_dev2" "$SCRATCH_MNT" >> $seqres.full swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch # Again, we know the swap file is on device 1.