From patchwork Mon Sep 25 19:56:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Wareing X-Patchwork-Id: 9970419 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 534A2602D8 for ; Mon, 25 Sep 2017 19:56:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 460902888F for ; Mon, 25 Sep 2017 19:56:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AD6C288C2; Mon, 25 Sep 2017 19:56:32 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 A46892888F for ; Mon, 25 Sep 2017 19:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965854AbdIYT4a (ORCPT ); Mon, 25 Sep 2017 15:56:30 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:53508 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936113AbdIYT42 (ORCPT ); Mon, 25 Sep 2017 15:56:28 -0400 Received: from pps.filterd (m0044008.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v8PJrtfO002743 for ; Mon, 25 Sep 2017 12:56:27 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=hgSYxeW/1dQ5RloXMkRPfgW0AFeYg5ZuogKQcMvQVkc=; b=m1GVOIo8tjyel1WFl051IhCMEPnz3USeScVtsXlYemyPVdIqh6gMUyUESQdQBW194im5 EEXRgA76vuiYo3DwlUzEwxYZV6pFtRB6bSAcR/sUtK/5eBvCVZFzhPThPFl+6hvxvHPh /j5q7rh5dqbOQEd20JLNKp7EgCA51qEMwD8= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2d763m0ndk-3 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 25 Sep 2017 12:56:27 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB09.TheFacebook.com (192.168.16.19) with Microsoft SMTP Server id 14.3.319.2; Mon, 25 Sep 2017 12:56:26 -0700 Received: from devbig279.prn1.facebook.com (localhost [127.0.0.1]) by devbig279.prn1.facebook.com (Postfix) with ESMTP id 963CE362074C; Mon, 25 Sep 2017 12:56:25 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Richard Wareing Smtp-Origin-Hostname: devbig279.prn1.facebook.com To: CC: , Smtp-Origin-Cluster: prn1c29 Subject: [PATCH v2 1/3] xfs/realtime: Add require_no_realtime function Date: Mon, 25 Sep 2017 12:56:23 -0700 Message-ID: <20170925195625.756877-1-rwareing@fb.com> X-Mailer: git-send-email 2.9.5 X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-25_08:, , signatures=0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some tests do not play well with realtime devices, in an effort to produce a stable set of test which exercise the realtime code paths we introduce a _require_no_realtime function to allow tests to opt out of realtime subvolume test runs. Signed-off-by: Richard Wareing --- Changes since v1: * None common/rc | 8 ++++++++ tests/generic/409 | 1 + tests/generic/410 | 1 + tests/generic/411 | 1 + tests/xfs/077 | 1 + tests/xfs/189 | 1 + tests/xfs/191-input-validation | 1 + tests/xfs/202 | 1 + tests/xfs/284 | 1 + 9 files changed, 16 insertions(+) diff --git a/common/rc b/common/rc index 53bbb11..a0081f1 100644 --- a/common/rc +++ b/common/rc @@ -1835,6 +1835,14 @@ _require_realtime() _notrun "Realtime device required, skipped this test" } +# This test requires that a realtime subvolume is not in use +# +_require_no_realtime() +{ + [ -n "$SCRATCH_RTDEV" ] && \ + _notrun "Test not compatible with realtime subvolumes, skipped this test" +} + # this test requires that a specified command (executable) exists # $1 - command, $2 - name for error message # diff --git a/tests/generic/409 b/tests/generic/409 index 3ad65c9..8ed3e4e 100755 --- a/tests/generic/409 +++ b/tests/generic/409 @@ -65,6 +65,7 @@ _supported_os Linux _require_test _require_scratch _require_local_device $SCRATCH_DEV +_require_no_realtime fs_stress() { diff --git a/tests/generic/410 b/tests/generic/410 index 63ab716..1bbaff8 100755 --- a/tests/generic/410 +++ b/tests/generic/410 @@ -73,6 +73,7 @@ _supported_os Linux _require_test _require_scratch _require_local_device $SCRATCH_DEV +_require_no_realtime fs_stress() { diff --git a/tests/generic/411 b/tests/generic/411 index 83f6d26..ea718fc 100755 --- a/tests/generic/411 +++ b/tests/generic/411 @@ -54,6 +54,7 @@ _supported_os Linux _require_test _require_scratch _require_local_device $SCRATCH_DEV +_require_no_realtime fs_stress() { diff --git a/tests/xfs/077 b/tests/xfs/077 index eba4f08..d202fa4 100755 --- a/tests/xfs/077 +++ b/tests/xfs/077 @@ -50,6 +50,7 @@ _cleanup() _supported_fs xfs _supported_os Linux +_require_no_realtime _require_scratch _require_xfs_crc _require_meta_uuid diff --git a/tests/xfs/189 b/tests/xfs/189 index 636f6f0..699eb3c 100755 --- a/tests/xfs/189 +++ b/tests/xfs/189 @@ -236,6 +236,7 @@ _putback_scratch_fstab() _supported_fs xfs _supported_os Linux +_require_no_realtime _require_scratch _require_noattr2 diff --git a/tests/xfs/191-input-validation b/tests/xfs/191-input-validation index cff3efa..764ac9b 100755 --- a/tests/xfs/191-input-validation +++ b/tests/xfs/191-input-validation @@ -47,6 +47,7 @@ _cleanup() # Modify as appropriate. _supported_fs xfs _supported_os Linux +_require_no_realtime _require_scratch _require_xfs_mkfs_validation diff --git a/tests/xfs/202 b/tests/xfs/202 index b9827a7..f887873 100755 --- a/tests/xfs/202 +++ b/tests/xfs/202 @@ -38,6 +38,7 @@ status=1 # failure is the default! _supported_fs xfs _supported_os Linux +_require_no_realtime # single AG will cause default xfs_repair to fail. This test is actually # testing the special corner case option needed to repair a single AG fs. _require_scratch_nocheck diff --git a/tests/xfs/284 b/tests/xfs/284 index e3625fe..fa5dac8 100755 --- a/tests/xfs/284 +++ b/tests/xfs/284 @@ -49,6 +49,7 @@ rm -f $seqres.full # real QA test starts here _supported_fs xfs _supported_os Linux +_require_no_realtime _require_test _require_scratch