From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S932315AbdJZE7d (ORCPT <rfc822;w@1wt.eu>);
        Thu, 26 Oct 2017 00:59:33 -0400
Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:53663 "EHLO
        mail2-relais-roc.national.inria.fr" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1751001AbdJZE7b (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 26 Oct 2017 00:59:31 -0400
X-IronPort-AV: E=Sophos;i="5.43,433,1503352800"; 
   d="scan'208";a="297941198"
Date: Thu, 26 Oct 2017 06:59:27 +0200 (CEST)
From: Julia Lawall <julia.lawall@lip6.fr>
X-X-Sender: jll@hadrien
To: Masahiro Yamada <yamada.masahiro@socionext.com>
cc: cocci@systeme.lip6.fr, linux-kbuild@vger.kernel.org,
        Julia Lawall <Julia.Lawall@lip6.fr>,
        Nicolas Palix <nicolas.palix@imag.fr>, linux-kernel@vger.kernel.org,
        Gilles Muller <Gilles.Muller@lip6.fr>,
        Michal Marek <michal.lkml@markovi.net>
Subject: Re: [PATCH] coccinelle: grep Options and Requires fields more
 precisely
In-Reply-To: <1508993438-15325-1-git-send-email-yamada.masahiro@socionext.com>
Message-ID: <alpine.DEB.2.20.1710260658330.17107@hadrien>
References: <1508993438-15325-1-git-send-email-yamada.masahiro@socionext.com>
User-Agent: Alpine 2.20 (DEB 67 2015-01-07)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org



On Thu, 26 Oct 2017, Masahiro Yamada wrote:

> Currently, the required version for badzero.cocci is picked up from
> its "Comments:" line since it contains the word "Requires".
>
> Surprisingly, ld-version.sh can extract the version number from the
> string "Requires Coccinelle version 1.0.0-rc20 or later", but this
> expectation is fragile.  Fix the .cocci file.  I removed "-rc20"
> because ld-version.sh cannot handle it.

OK.

> Make the coccicheck script to see exact patterns for "Options:" and
> "Requires:" in order to avoid accidental matching to what just happens
> to appear in comment lines.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Thanks for checking on this!

Acked-by: Julia Lawall <julia.lawall@lip6.fr>

> ---
>
>  scripts/coccicheck                    | 4 ++--
>  scripts/coccinelle/null/badzero.cocci | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/coccicheck b/scripts/coccicheck
> index 3e21a1b..1bfa2d2 100755
> --- a/scripts/coccicheck
> +++ b/scripts/coccicheck
> @@ -168,8 +168,8 @@ OPTIONS="$OPTIONS $SPFLAGS"
>  coccinelle () {
>      COCCI="$1"
>
> -    OPT=`grep "Option" $COCCI | cut -d':' -f2`
> -    REQ=`grep "Requires" $COCCI | cut -d':' -f2 | sed "s| ||"`
> +    OPT=`grep "Options:" $COCCI | cut -d':' -f2`
> +    REQ=`grep "Requires:" $COCCI | cut -d':' -f2 | sed "s| ||"`
>      REQ_NUM=$(echo $REQ | ${DIR}/scripts/ld-version.sh)
>      if [ "$REQ_NUM" != "0" ] ; then
>  	    if [ "$SPATCH_VERSION_NUM" -lt "$REQ_NUM" ] ; then
> diff --git a/scripts/coccinelle/null/badzero.cocci b/scripts/coccinelle/null/badzero.cocci
> index 5551da2..f597c80 100644
> --- a/scripts/coccinelle/null/badzero.cocci
> +++ b/scripts/coccinelle/null/badzero.cocci
> @@ -10,7 +10,7 @@
>  // Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
>  // Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
>  // URL: http://coccinelle.lip6.fr/
> -// Comments: Requires Coccinelle version 1.0.0-rc20 or later
> +// Requires: 1.0.0
>  // Options:
>
>  virtual patch
> --
> 2.7.4
>
>