From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id A9903292D for ; Thu, 10 Mar 2016 13:34:58 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 10 Mar 2016 04:34:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,315,1455004800"; d="scan'208";a="667023987" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.221.48]) ([10.237.221.48]) by FMSMGA003.fm.intel.com with ESMTP; 10 Mar 2016 04:34:56 -0800 To: Panu Matilainen , dev@dpdk.org References: <56E16701.5060502@intel.com> <56E168C6.3060802@redhat.com> From: Ferruh Yigit Message-ID: <56E169EF.3010103@intel.com> Date: Thu, 10 Mar 2016 12:34:55 +0000 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <56E168C6.3060802@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH 3/3] scripts: ignore self-generated directories in validate-abi startup check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2016 12:34:59 -0000 On 3/10/2016 12:29 PM, Panu Matilainen wrote: > On 03/10/2016 02:22 PM, Ferruh Yigit wrote: >> On 3/10/2016 10:53 AM, Panu Matilainen wrote: >>> When doing multiple runs of validate-abi.sh, the git status check >>> will more often than not unnecessarily fail with "Working directory not >>> clean" error because of the compat_result and compile target directories >>> from the previous run. Filter out the self-generated directories >>> when checking. >>> >>> Signed-off-by: Panu Matilainen >>> --- >>> scripts/validate-abi.sh | 3 +-- >>> 1 file changed, 1 insertion(+), 2 deletions(-) >>> >>> diff --git a/scripts/validate-abi.sh b/scripts/validate-abi.sh >>> index ea60639..a21f883 100755 >>> --- a/scripts/validate-abi.sh >>> +++ b/scripts/validate-abi.sh >>> @@ -163,8 +163,7 @@ log "INFO" "against DPDK DSOs built from version $TAG2." >>> log "INFO" "" >>> >>> # Check to make sure we have a clean tree >>> -git status | grep -q clean >>> -if [ $? -ne 0 ] >>> +if [ $(git status --porcelain | grep -vE "($TARGET|compat_reports)" | wc -l) -ne 0 ] >>> then >>> log "WARN" "Working directory not clean, aborting" >>> cleanup_and_exit 1 >>> >> Hi Panu, >> >> This check catches untracked files too, does it makes sense to limit >> error only to modified files (local or staged)? > > I did ponder about that, untracked files seem mostly harmless in this > picture but erred on the side of caution. > This is something prevents me running script from working tree, and forces to create a new clone. >> >> This also prevents specific "compat_reports" folder check. >> >> And of course mentioned change requires "git clean -fd" removed, or >> replaced with "make clean" > > Sorry, I dont understand you mean by these two comments. > If untracked files accepted by script, "compat_reports" exclusion is no more required, and "git clean -fd" needs to removed from script. Regards, ferruh