From patchwork Sun Feb 5 06:53:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 9555917 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 D4F67604DC for ; Sun, 5 Feb 2017 06:53:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C663F27165 for ; Sun, 5 Feb 2017 06:53:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB2F2275A2; Sun, 5 Feb 2017 06:53:48 +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 1E11E271FD for ; Sun, 5 Feb 2017 06:53:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751774AbdBEGxr (ORCPT ); Sun, 5 Feb 2017 01:53:47 -0500 Received: from imap.thunk.org ([74.207.234.97]:33740 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751734AbdBEGxq (ORCPT ); Sun, 5 Feb 2017 01:53:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=Message-Id:Date:Subject:Cc:To:From; bh=JCCzSK/+NnJoEGz354fuOapgJmc9lP8cvPrY7mgyAMU=; b=uJnh4aXxQ9ewtW/RkH0rwt6Yzb6xoL/PFBY+9liUeOuJ+y/BLWnDEUiCob2DKeS2EBfR1Je01A2ny78T/7TrX7zJ5zqHe0Nsfq1pKPT21qhBvXx9ZeRxSPCsuicAQ1C9ktbghcZHEKDgg0ncq1xc9/WpK7lKXecnceZ98EErAwo=; Received: from root (helo=callcc.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.84_2) (envelope-from ) id 1caGhi-00014v-NU; Sun, 05 Feb 2017 06:53:42 +0000 Received: by callcc.thunk.org (Postfix, from userid 15806) id 1AC4DC00497; Sun, 5 Feb 2017 01:53:41 -0500 (EST) From: Theodore Ts'o To: fstests@vger.kernel.org Cc: Theodore Ts'o Subject: [PATCH 1/3] generic: honor the FSSTRESS_AVOID environment variable Date: Sun, 5 Feb 2017 01:53:34 -0500 Message-Id: <20170205065336.14994-1-tytso@mit.edu> X-Mailer: git-send-email 2.11.0.rc0.7.gbe5a750 X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure all tests which run fsstress, and which do not have a very specific custom profile of which file system operations to run, honor the FSSTRESS_AVOID environment variable. Signed-off-by: Theodore Ts'o --- tests/generic/051 | 2 +- tests/generic/232 | 2 +- tests/generic/388 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/generic/051 b/tests/generic/051 index b0c37824..7b807b9f 100755 --- a/tests/generic/051 +++ b/tests/generic/051 @@ -63,7 +63,7 @@ PROCS=$((2 * LOAD_FACTOR)) load_dir=$SCRATCH_MNT/test # let this run for a while -$FSSTRESS_PROG -n10000000 -p $PROCS -d $load_dir >> $seqres.full 2>&1 & +$FSSTRESS_PROG $FSSTRESS_AVOID -n10000000 -p $PROCS -d $load_dir >> $seqres.full 2>&1 & sleep $SLEEP_TIME $KILLALL_PROG -q $FSSTRESS_PROG wait diff --git a/tests/generic/232 b/tests/generic/232 index 6b197791..f4853f72 100755 --- a/tests/generic/232 +++ b/tests/generic/232 @@ -53,7 +53,7 @@ _fsstress() out=$SCRATCH_MNT/fsstress.$$ count=2000 - args=`_scale_fsstress_args -d $out -n $count -p 7` + args=`_scale_fsstress_args -d $out -n $count -p 7 $FSSTRESS_AVOID` echo "fsstress $args" >> $seqres.full if ! $FSSTRESS_PROG $args | tee -a $seqres.full | _filter_num diff --git a/tests/generic/388 b/tests/generic/388 index 9d4ba9d6..3729aa5b 100755 --- a/tests/generic/388 +++ b/tests/generic/388 @@ -65,7 +65,7 @@ _scratch_mkfs >> $seqres.full 2>&1 _scratch_mount || _fail "mount failed" for i in $(seq 1 50); do - ($FSSTRESS_PROG -d $SCRATCH_MNT -n 999999 -p 4 >> $seqres.full &) \ + ($FSSTRESS_PROG $FSSTRESS_AVOID -d $SCRATCH_MNT -n 999999 -p 4 >> $seqres.full &) \ > /dev/null 2>&1 # purposely include 0 second sleeps to test shutdown immediately after