Commita85c43a

authored

Merge pull request#234 from github/jsinglet/compiler-path-fix

small enhancement to make rules that don't match not appear

2 parents3b17207 +a132ef4 commita85c43aCopy full SHA for a85c43a

File tree

+49

-9

lines changed

+49

-9

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,12 @@ function Get-RuleForPath {`
`41`	`41`	`$allQueries=@()`
`42`	`42`	`$queriesToCheck=@()`
`43`	`43`
`44`		`-# load all the queries`
	`44`	`+`
`45`	`45`	`foreach ($sin$AVAILABLE_SUITES) {`
`46`	`46`	`$allQueries+=Get-RulesInSuite-Suite$s-Language$Language`
`47`	`47`	`}`
`48`	`48`
	`49`	`+`
`49`	`50`	`$modifiedPathWithReplacement=Join-Path (Resolve-Path.-Relative)$Path`
`50`	`51`	`# replace "src" with "test" to make it match up`
`51`	`52`	`$sep= [IO.Path]::DirectorySeparatorChar`
`@@ -57,20 +58,18 @@ function Get-RuleForPath {`
`57`	`58`
`58`	`59`	`# for each query, create the test directory`
`59`	`60`	`foreach($qin$allQueries){`
`60`		`-`
`61`	`61`	`# get test directory`
`62`	`62`	`$testDirs= (Get-ATestDirectory-RuleObject$q-Language$Language)`
`63`	`63`	`foreach($testDirectoryin$testDirs){`
`64`	`64`	`# resolve path to be compatible`
`65`		`-$testPath=Join-Path (Resolve-Path.-Relative)$testDirectory`
	`65`	`+$testPath=(Join-Path (Resolve-Path.-Relative)$testDirectory)`
`66`	`66`
`67`		`-# see if the TEST directory is a substring of the full path`
`68`		`-if($modifiedPath.StartsWith($testPath)){`
	`67`	`+if((Split-Path$modifiedPath-Parent)-eq$testPath){`
`69`	`68`	`$matchingRules+=$q`
`70`	`69`	`continue`
`71`	`70`	`}`
`72`	`71`
`73`		`-if($modifiedPathWithReplacement.StartsWith($testPath)){`
	`72`	`+if((Split-Path$modifiedPathWithReplacement-Parent)-eq$testPath){`
`74`	`73`	`$matchingRules+=$q`
`75`	`74`	`continue`
`76`	`75`	`}`

Lines changed: 39 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,39 @@`
	`1`	`+functionTest-GetRuleForPath {`
	`2`	`+param(`
	`3`	`+ [Parameter(Mandatory)]`
	`4`	`+ [string]`
	`5`	`+$PR`
	`6`	`+)`
	`7`	`+`
	`8`	`+$prData= (gh pr view-R github/codeql-coding-standards$PR--json headRefOid,headRepository,author,isCrossRepository,headRepositoryOwner,headRefName,files)\|ConvertFrom-Json`
	`9`	`+`
	`10`	`+foreach($fin$prData.files){`
	`11`	`+try {`
	`12`	`+Write-Host"[C] Scanning file for relationship$($f.path)..."`
	`13`	`+$rulesToTest=Get-RuleForPath-Language c-Path"$($f.path)"`
	`14`	`+`
	`15`	`+Write-Host"[C] Got$($rulesToTest.Count) potential C rules..."`
	`16`	`+`
	`17`	`+foreach($rin$rulesToTest){`
	`18`	`+$ruleNames+=$r.__memberof_rule`
	`19`	`+Write-Host"[C] Found rule$r"`
	`20`	`+ }`
	`21`	`+ }catch{`
	`22`	`+Write-Host"No$Language rules found for path:$($f.path)"`
	`23`	`+ }`
	`24`	`+`
	`25`	`+`
	`26`	`+try {`
	`27`	`+Write-Host"[CPP] Scanning file for relationship$($f.path)..."`
	`28`	`+$rulesToTest=Get-RuleForPath-Language cpp-Path"$($f.path)"`
	`29`	`+`
	`30`	`+Write-Host"[CPP] Got$($rulesToTest.Count) potential CPP rules..."`
	`31`	`+`
	`32`	`+foreach($rin$rulesToTest){`
	`33`	`+Write-Host"[CPP] Found rule$r"`
	`34`	`+ }`
	`35`	`+ }catch{`
	`36`	`+Write-Host"No CPP rules found for path:$($f.path)"`
	`37`	`+ }`
	`38`	`+}`
	`39`	`+}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ Write-Host -ForegroundColor ([ConsoleColor]2) "OK"`
`37`	`37`	`$CODEQL_VERSION= (codeql version--format json\|ConvertFrom-Json).version`
`38`	`38`
`39`	`39`	`Write-Host"Checking 'codeql' version =$REQUIRED_CODEQL_VERSION...."-NoNewline`
`40`		`-if (-Not$CODEQL_VERSION-eq$REQUIRED_CODEQL_VERSION) {`
	`40`	`+if (-Not($CODEQL_VERSION-eq$REQUIRED_CODEQL_VERSION)) {`
`41`	`41`	`throw"Invalid CodeQL version$CODEQL_VERSION. Please install$REQUIRED_CODEQL_VERSION."`
`42`	`42`	`}`
`43`	`43`	`Write-Host-ForegroundColor ([ConsoleColor]2)"OK"`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+Import-Module-Name"$PSScriptRoot/../PSCodingStandards/CodingStandards"`
	`2`	`+`
`1`	`3`	`$COMPILER_MAPPINGS=@{`
`2`	`4`	`"cpp"=@{`
`3`	`5`	`"clang"="clang++";`
`@@ -27,7 +29,7 @@ $COMPILER_ARGS = @{`
`27`	`29`
`28`	`30`	`}`
`29`	`31`
`30`		`-$REQUIRED_CODEQL_VERSION="2.6.3"`
	`32`	`+$REQUIRED_CODEQL_VERSION=(Get-Content (Join-Path (Get-RepositoryRoot)"supported_codeql_configs.json")\|ConvertFrom-Json).supported_environment.codeql_cli`
`31`	`33`
`32`	`34`
`33`	`35`	`$REPORT_QUERY=@"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ Write-Host -ForegroundColor ([ConsoleColor]2) "OK"`
`262`	`262`	`$CODEQL_VERSION= (codeql version--format json\|ConvertFrom-Json).version`
`263`	`263`
`264`	`264`	`Write-Host"Checking 'codeql' version =$REQUIRED_CODEQL_VERSION...."-NoNewline`
`265`		`-if (-Not$CODEQL_VERSION-eq$REQUIRED_CODEQL_VERSION) {`
	`265`	`+if (-Not($CODEQL_VERSION-eq$REQUIRED_CODEQL_VERSION)) {`
`266`	`266`	`throw"Invalid CodeQL version$CODEQL_VERSION. Please install$REQUIRED_CODEQL_VERSION."`
`267`	`267`	`}`
`268`	`268`	`Write-Host-ForegroundColor ([ConsoleColor]2)"OK"`

Comments

(0)