From patchwork Sun Jun 26 10:47:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omer Zilberberg X-Patchwork-Id: 9199309 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 D49AE60752 for ; Sun, 26 Jun 2016 10:47:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC40D28530 for ; Sun, 26 Jun 2016 10:47:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AFFD52853D; Sun, 26 Jun 2016 10:47:36 +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 34B1028530 for ; Sun, 26 Jun 2016 10:47:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752069AbcFZKrf (ORCPT ); Sun, 26 Jun 2016 06:47:35 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:34101 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752053AbcFZKre (ORCPT ); Sun, 26 Jun 2016 06:47:34 -0400 Received: by mail-wm0-f46.google.com with SMTP id 187so16091737wmz.1 for ; Sun, 26 Jun 2016 03:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=plexistor-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=3OFTW2vyDv+b6PLqQDaEt2U2eostU+FpndypTolNWks=; b=m9VoJ6jiPzVWpftKFjVN9SLjo5T86hji8nROoVGmfFPjC/D8iA74JWXIuc8PORHGVb GD/pRBdtmYTkfyDwTXdttc9mMrEXEFBgtGg+mg+jN1ucf8TCwsfhmJ1q6GeGzT9XnBfr YgKeR+OVmQShNRZt+fFfFirtLCXzUoiWyVLUeV5FeUGgpoGgBKhTNd6gNokcXL58hrJr AyfqcGgzbL8rkaoSurRB7EyGdX86mj+8L9Ntcqh9FSitvMJ+PSq/5xT06aiMKHrBekYs 50NYWgv+++8ZcTtI20oSIxl3+gOUkHjwQ6oNP2cl7/mKH/MxeR2pqtuQTsJ1PsUH//7B uF2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3OFTW2vyDv+b6PLqQDaEt2U2eostU+FpndypTolNWks=; b=bqmMqULVixn2LqCreZ16HWd/lU04U51nRZzTQabBQIEc8GHBADNs529xBXDdIi2iXf SXP4vZP0hKthk+yywE1ten6nRdzFy3il5H4CO8+TqTZA2o8LeVMguIGePpnVyD2ud0l7 3PYeFrjvHD4kSHTpxCQqLWDaOd1a4w3jGdU/TgXW5R7aZjg2u+JifSNrELyYsWXAVWDT weFQaSHREfqRreEFib+uEysL7mIm0MlSqNyZrWvGkCbDJ09rtaiNYl5tWX1e68jkH7BN ATOp3nFevoTAhbtQj4oN8PFaITvfI+lRRSkTZayMrKzg7sEDXWik9BGDu2K6USx4lUqL Yq3Q== X-Gm-Message-State: ALyK8tKtI4fnvANV9YBKLI+lA6qcaIEQ3E76ryGqQnf4m4e4kaFRux3Sq116pArmPWGW5A== X-Received: by 10.28.197.140 with SMTP id v134mr6070866wmf.2.1466938053346; Sun, 26 Jun 2016 03:47:33 -0700 (PDT) Received: from nyx.localdomain ([207.232.55.62]) by smtp.gmail.com with ESMTPSA id q63sm5942733wma.0.2016.06.26.03.47.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jun 2016 03:47:32 -0700 (PDT) From: Omer Zilberberg To: fstests@vger.kernel.org Cc: Omer Zilberberg Subject: [PATCH] generic/294: filter quotes from mknod Date: Sun, 26 Jun 2016 13:47:24 +0300 Message-Id: <1466938044-23916-1-git-send-email-omzg@plexistor.com> X-Mailer: git-send-email 2.5.5 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since coreutils v8.25, mknod errors omit quotes around filenames, and this breaks generic/294's golden image. Checked on Ubuntu 16.04. See coreutils: 08e8fd7 all: avoid quoting file names when possible https://github.com/coreutils/coreutils/commit/08e8fd7e38f2dae7c69c54eb22d508b6517e66e5 Signed-off-by: Omer Zilberberg --- common/filter | 5 +++++ tests/generic/294 | 2 +- tests/generic/294.out | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/filter b/common/filter index 244621a..a16ef70 100644 --- a/common/filter +++ b/common/filter @@ -385,5 +385,10 @@ _filter_od() ' } +_filter_mknod() +{ + sed -e "s/mknod: '\(.*\)': File exists/mknod: \1: File exists/" +} + # make sure this script returns success /bin/true diff --git a/tests/generic/294 b/tests/generic/294 index 3fa6ba2..fb5d9aa 100755 --- a/tests/generic/294 +++ b/tests/generic/294 @@ -55,7 +55,7 @@ THIS_TEST_DIR=$SCRATCH_MNT/$seq.test _create_files() { - mknod $THIS_TEST_DIR/testnode c 1 3 + mknod $THIS_TEST_DIR/testnode c 1 3 2>&1 | _filter_mknod mkdir $THIS_TEST_DIR/testdir touch $THIS_TEST_DIR/testtarget ln -s $THIS_TEST_DIR/testtarget $THIS_TEST_DIR/testlink 2>&1 | _filter_ln diff --git a/tests/generic/294.out b/tests/generic/294.out index 1ac1c67..7802472 100644 --- a/tests/generic/294.out +++ b/tests/generic/294.out @@ -1,5 +1,5 @@ QA output created by 294 -mknod: 'SCRATCH_MNT/294.test/testnode': File exists +mknod: SCRATCH_MNT/294.test/testnode: File exists mkdir: cannot create directory 'SCRATCH_MNT/294.test/testdir': File exists touch: cannot touch 'SCRATCH_MNT/294.test/testtarget': Read-only file system ln: creating symbolic link 'SCRATCH_MNT/294.test/testlink': File exists