From patchwork Wed Feb 11 17:36:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 5813921 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B9AA99F30C for ; Wed, 11 Feb 2015 17:36:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 60C5920218 for ; Wed, 11 Feb 2015 17:36:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 580A120212 for ; Wed, 11 Feb 2015 17:36:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753428AbbBKRgw (ORCPT ); Wed, 11 Feb 2015 12:36:52 -0500 Received: from sandeen.net ([63.231.237.45]:51549 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753056AbbBKRgv (ORCPT ); Wed, 11 Feb 2015 12:36:51 -0500 Received: from liberator.sandeen.net (liberator.sandeen.net [10.0.0.4]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by sandeen.net (Postfix) with ESMTPSA id 720FD60FCB20; Wed, 11 Feb 2015 11:36:50 -0600 (CST) Message-ID: <54DB9332.5010606@sandeen.net> Date: Wed, 11 Feb 2015 11:36:50 -0600 From: Eric Sandeen MIME-Version: 1.0 To: Boaz Harrosh , Dave Chinner , xfs@oss.sgi.com, linux-fsdevel , fstests@vger.kernel.org Subject: [PATCH V2] fstests: shared/032 handle mkfs.* in either /sbin or /usr/sbin References: <54DB35F0.1010203@plexistor.com> <54DB8D2D.20104@sandeen.net> In-Reply-To: <54DB8D2D.20104@sandeen.net> 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=ham 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 mkfs executables may live in either /sbin or /usr/sbin, and the current regexp in this test only catches the former, and so the test won't run properly with the latter. Fix this by filtering out whatever was found as ${MKFS_PROG}, rather than a hard-coded /sbin/mkfs path. Because the list was generated by using a wildcard with ${MKFS_PROG}.* this will always be the correct filter. Reported-by: Boaz Harrosh Signed-off-by: Eric Sandeen --- V2: KISS -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tests/shared/032 b/tests/shared/032 index a410003..3b06382 100755 --- a/tests/shared/032 +++ b/tests/shared/032 @@ -50,7 +50,7 @@ if [ "$FSTYP" == "btrfs" ]; then fi echo "Silence is golden." -for fs in `echo ${MKFS_PROG}.* | sed -e 's/.sbin.mkfs.//g'` +for fs in `echo ${MKFS_PROG}.* | sed -e "s:${MKFS_PROG}.::g"` do preop="" # for special input needs preargs="" # for any special pre-device options