From patchwork Mon Jan 27 14:38:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 1229879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 485snB5JxZz9sRW; Tue, 28 Jan 2020 01:38:36 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iw5X6-0001FO-JG; Mon, 27 Jan 2020 14:38:32 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iw5X2-0001F5-I7 for kernel-team@lists.ubuntu.com; Mon, 27 Jan 2020 14:38:28 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iw5X2-0000wW-8z for kernel-team@lists.ubuntu.com; Mon, 27 Jan 2020 14:38:28 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: ubuntu_zfs_xfs_generic: fix warning with awk 5.x Date: Mon, 27 Jan 2020 15:38:27 +0100 Message-Id: <20200127143827.7908-2-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200127143827.7908-1-paolo.pisati@canonical.com> References: <20200127143827.7908-1-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Paolo Pisati Acked-by: Colin Ian King --- ...ric-001-remove-unnecessary-backslash.patch | 38 +++++++++++++++++++ .../ubuntu_zfs_xfs_generic.py | 3 ++ 2 files changed, 41 insertions(+) create mode 100644 ubuntu_zfs_xfs_generic/0006-generic-001-remove-unnecessary-backslash.patch diff --git a/ubuntu_zfs_xfs_generic/0006-generic-001-remove-unnecessary-backslash.patch b/ubuntu_zfs_xfs_generic/0006-generic-001-remove-unnecessary-backslash.patch new file mode 100644 index 00000000..3357f054 --- /dev/null +++ b/ubuntu_zfs_xfs_generic/0006-generic-001-remove-unnecessary-backslash.patch @@ -0,0 +1,38 @@ +From 95a2510bb1f2844adb3615feda50d49a9b903fae Mon Sep 17 00:00:00 2001 +From: Murphy Zhou +Date: Wed, 9 Oct 2019 13:34:34 +0800 +Subject: [PATCH] generic/001: remove unnecessary backslash + +Awk 5.0.1 is complaining about this backslash and causing false alarm +like this: + warning: regexp escape sequence '\#' is not a known regexp operator + +This fix works fine with Awk 3.1.7 , 4.0.2 , 4.2.1 and 5.0.1. This +backslash is not necessary. + +Signed-off-by: Murphy Zhou +Reviewed-by: Christoph Hellwig +Signed-off-by: Eryu Guan +(cherry-picked from https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git +95a2510bb1f2844adb3615feda50d49a9b903fae) +Signed-off-by: Paolo Pisati +--- + tests/generic/001 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/generic/001 b/tests/generic/001 +index 046e54e3..3a047754 100755 +--- a/tests/generic/001 ++++ b/tests/generic/001 +@@ -177,7 +177,7 @@ _chain() + { + $AWK_PROG -v full_file=$seqres.full -v verify=$verify <$tmp.config ' + BEGIN { nfile = 0 } +-/^\#/ { next } ++/^#/ { next } + { file[nfile] = $1 + size[nfile] = $2 + link[nfile] = 0 +-- +2.24.0 + diff --git a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py index 88ca18fc..a99c7678 100644 --- a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py +++ b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py @@ -105,6 +105,9 @@ class ubuntu_zfs_xfs_generic(test.test): utils.system('git reset --hard ' + commit) print "Patching xfstests-dev to add minimal support for ZFS" utils.system('patch -p1 < %s/0001-xfstests-add-minimal-support-for-zfs.patch' % self.bindir) + print "Patching xfstests-dev: fix warning with Awk 5.0.1" + utils.system('patch -p1 < %s/0006-generic-001-remove-unnecessary-backslash.patch' % self.bindir) + os.chdir(os.path.join(self.srcdir, 'xfstests-bld')) print "getting xfs tests source"