summaryrefslogtreecommitdiff
authorJianxiong Pan <jianxiong.pan@amlogic.com>2018-10-17 05:59:59 (GMT)
committer Jianxin Pan <jianxin.pan@amlogic.com>2018-10-17 06:27:48 (GMT)
commit5940d7f2585937e385982c607b7028f30b2f2baf (patch)
tree6c0c8451cd6b7ca603283d3346e102cf662b92fb
parentdab56dff36d14cf7615af99609b3e43b60b5fc57 (diff)
downloadcommon-5940d7f2585937e385982c607b7028f30b2f2baf.zip
common-5940d7f2585937e385982c607b7028f30b2f2baf.tar.gz
common-5940d7f2585937e385982c607b7028f30b2f2baf.tar.bz2
script: add new check relus in merge_pre_check.pl script [1/1]
PD#174488 Problem: add some new rules Solution: expand the scope of check Verify: p212 Change-Id: I4b5428367520456195645dbbce86c5f40411d59a Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Diffstat
-rwxr-xr-xscripts/amlogic/merge_pre_check.pl10
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/amlogic/merge_pre_check.pl b/scripts/amlogic/merge_pre_check.pl
index e04be96..d4b107c 100755
--- a/scripts/amlogic/merge_pre_check.pl
+++ b/scripts/amlogic/merge_pre_check.pl
@@ -17,7 +17,7 @@ sub get_kernel_version
close F;
if( $line =~ /^VERSION = (\w)$/)
{
- $k_v = $1;
+ $k_v = $1;
}
#print "$k_v\n";
}
@@ -118,12 +118,11 @@ sub check_msg_49
if( $lnum == 7 )
{
- if( $line !~ /^(\s){4}PD\#(\d)+/ &&
- $line !~ /^(\s){4}PD\#SWPL-(\d)+/ )
+ if( $line !~ /^(\s){4}PD\#/ )
{
$err_cnt += 1;
$line =~ s/^(\s){4}//;
- $err_msg .= " $err_cnt: <PD#xxxx/PD#SWPL-XXXX: detailed description>, but <$line>\n";
+ $err_msg .= " $err_cnt: <PD#XXXX: detailed description>, but <$line>\n";
}
}
}
@@ -135,8 +134,7 @@ sub check_msg_314
if( $lnum == 5 )
{
- if ($line !~ /^(\s){4}PD\#(\d)+:\s([\w]+:\s){1,2}[\w]+.*[\S]+$/
- && $line !~ /^(\s){4}PD\#SWPL-(\d)+:\s([\w]+:\s){1,2}[\w]+.*[\S]+$/)
+ if ($line !~ /^(\s){4}PD\#(\w)+:\s([\w]+:\s){1,2}[\w]+.*[\S]+$/)
{
$err_cnt += 1;
$line =~ s/^(\s){4}//;