From patchwork Mon Jun 27 12:53:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omer Zilberberg X-Patchwork-Id: 9200481 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 CEDED60752 for ; Mon, 27 Jun 2016 12:53:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C17962837F for ; Mon, 27 Jun 2016 12:53:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B64CE2857A; Mon, 27 Jun 2016 12:53:53 +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 3E0722837F for ; Mon, 27 Jun 2016 12:53:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751879AbcF0Mxw (ORCPT ); Mon, 27 Jun 2016 08:53:52 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35013 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673AbcF0Mxv (ORCPT ); Mon, 27 Jun 2016 08:53:51 -0400 Received: by mail-wm0-f50.google.com with SMTP id v199so99019069wmv.0 for ; Mon, 27 Jun 2016 05:53:51 -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=LnTLdNlqnVO0I8jMr7lnfQJn1lNP5Ok1E7V+rgXxN8c=; b=D6GCBAighpbdo/5N/6ndoDi57IceW8X8HYoyODk8ycHV/Iyq+WrHPCXKWkErRMxeeh rSVXWTJWzLWEvvTkJjOrYUN1hK6JckjpXelyyipH3aEOIYt4HT6/BDtDtp4pg1xQ6ORD j/yBYJAY8L8WKrRCC8dp444QeqYYHfsUhcAU4LpQHpB79haXeq87Pxc12slreIv1wWYS LLxaJmFYFTucvbK5SC7iVpDZ4uo8WLMutUl6VlXzJI/jeB5cnYgAy8dsmPHvt9r+xhvl dITqPgoobzkCb1+hRrPqhAt2LeDIuUHs+e/2aIkYMeLvHrQkRAGD0/VZvBk6Rbv3LDhu VgUA== 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=LnTLdNlqnVO0I8jMr7lnfQJn1lNP5Ok1E7V+rgXxN8c=; b=GYpxQx3F4LiQ9rmoUszWI8vzARUZF55NbwF+Im6z8+sEIAzI/cNiKzkVeFcafl3iy7 p6K12VyrHYgU5Z4bBM8xY++IuZOL+z0LUM/N7v5+Z44R3hJnHqR8r35/mpvMz3iATTMd rQqdh1gNlWLyE+NIudZFPXRzwt5wPdVZeADbbfXaxTDVo+UhwqF3r1mzqi8XTE8RqBCE 4XvEN9xChPoTm+jJWkxssPtQA+hbMyelEkv8VomoBISV7GHMLnYbGeiBCBv5Ia5146x4 oAquVfNHp7zAm0n54HSRqdP+t7rZLeMnthn+8Dve/X0Hxs/rkJls/iPzX6PZd296G/Mg S/GA== X-Gm-Message-State: ALyK8tKJebybn7+2ZOKYZuf8eWsNMVM/Dix9U6LCYqc/ShiugOG1PAgf2u7xcbDaWR4bFA== X-Received: by 10.28.138.85 with SMTP id m82mr11066339wmd.88.1467032030411; Mon, 27 Jun 2016 05:53:50 -0700 (PDT) Received: from nyx.localdomain (bzq-84-108-254-142.cablep.bezeqint.net. [84.108.254.142]) by smtp.gmail.com with ESMTPSA id qg5sm15392wjc.13.2016.06.27.05.53.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2016 05:53:49 -0700 (PDT) From: Omer Zilberberg To: fstests@vger.kernel.org Cc: Omer Zilberberg Subject: [PATCH v2] generic/294: filter quotes from mknod Date: Mon, 27 Jun 2016 15:53:28 +0300 Message-Id: <1467032008-16374-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 v2: added comment to _filter_mknod. --- common/filter | 7 +++++++ tests/generic/294 | 2 +- tests/generic/294.out | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common/filter b/common/filter index 244621a..8d9f489 100644 --- a/common/filter +++ b/common/filter @@ -385,5 +385,12 @@ _filter_od() ' } +# Remove quotes from failed mknod calls. Starting with Coreutils v8.25, +# mknod errors print unquoted filenames +_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