From patchwork Fri Apr 10 13:02:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 6195381 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 91A6DBF4A7 for ; Fri, 10 Apr 2015 13:02:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ABEE820411 for ; Fri, 10 Apr 2015 13:02:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFC7B2041E for ; Fri, 10 Apr 2015 13:02:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933101AbbDJNCk (ORCPT ); Fri, 10 Apr 2015 09:02:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46035 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932672AbbDJNCj (ORCPT ); Fri, 10 Apr 2015 09:02:39 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3AD2cod020746 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 10 Apr 2015 09:02:38 -0400 Received: from jtulak.brq.redhat.com ([10.34.27.15]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3AD2Tgn016509; Fri, 10 Apr 2015 09:02:37 -0400 From: =?UTF-8?q?Jan=20=C5=A4ul=C3=A1k?= To: fstests@vger.kernel.org Cc: david@fromorbit.com Subject: [PATCH 7/7] fstests: environments - enable performance tests in ./check Date: Fri, 10 Apr 2015 15:02:29 +0200 Message-Id: <1428670949-17524-8-git-send-email-jtulak@redhat.com> In-Reply-To: <1428670949-17524-1-git-send-email-jtulak@redhat.com> References: <1428670949-17524-1-git-send-email-jtulak@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Because performance tests can take longer and are usually not needed, they won't run together with regression tests, but has to be enabled using -performance flag. With it, only perf tests will run. Signed-off-by: Jan ?ulák --- check | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/check b/check index c746d71..a80f69b 100755 --- a/check +++ b/check @@ -36,6 +36,7 @@ have_test_arg=false randomize=false export here=`pwd` xfile="" +performance=false # start the initialisation work now iam=check @@ -70,6 +71,7 @@ check options -nfs test NFS -cifs test CIFS -tmpfs test TMPFS + -performance performance tests -l line mode diff -udiff show unified diff (default) -n show me, do not run tests @@ -172,8 +174,11 @@ export_filtered_environments() get_group_list() { grp=$1 - - for d in $SRC_GROUPS $FSTYP; do + tests="$SRC_GROUPS $FSTYP" + if $performance; then + tests="$SRC_GROUPS" + fi + for d in $tests; do l=$(sed -n < $SRC_DIR/$d/group \ -e 's/#.*//' \ -e 's/$/ /' \ @@ -188,7 +193,11 @@ get_group_list() get_all_tests() { touch $tmp.list - for d in $SRC_GROUPS $FSTYP; do + tests="$SRC_GROUPS $FSTYP" + if $performance; then + tests="$SRC_GROUPS" + fi + for d in $tests; do ls $SRC_DIR/$d/* | \ grep -v "\..*" | \ grep "^$SRC_DIR/$d/$VALID_TEST_NAME"| \ @@ -291,6 +300,8 @@ while [ $# -gt 0 ]; do -nfs) FSTYP=nfs ;; -cifs) FSTYP=cifs ;; -tmpfs) FSTYP=tmpfs ;; + -performance) SRC_GROUPS="performance"; + performance=true;; -g) group=$2 ; shift ; GROUP_LIST="$GROUP_LIST $group"