learned a thing or two about powershell return values :)

Author: jsinglet

scripts/matrix_testing/CreateMatrixTestReport.ps1

@@ -322,7 +322,11 @@ $jobRows = $queriesToCheck | ForEach-Object -ThrottleLimit $NumThreads -Parallel
         ###########################################################
         # Push context 
         ###########################################################
-        $context = Push-CompilerSpecificFiles -Configuration $using:Configuration -Language $using:Language -FileSet (Get-CompilerSpecificFiles -TestDirectory $testDirectory)
+        $fileSet = (Get-CompilerSpecificFiles -Configuration $using:Configuration -Language $using:Language  -TestDirectory $testDirectory)
+        
+        if($fileSet){
+            $context = Push-CompilerSpecificFiles -Configuration $using:Configuration -Language $using:Language -FileSet $fileSet
+        }
 
         Write-Host "Compiling database in $testDirectory..." -NoNewline
 
@@ -400,16 +404,15 @@ $jobRows = $queriesToCheck | ForEach-Object -ThrottleLimit $NumThreads -Parallel
         }
 
         return $row 
-    }catch {
-        Write-Host "Unknown error processing rule."
-        return $row
     }finally {
 
         ###########################################################
         ###########################################################
         # Context is restored here
         ###########################################################
-        Pop-CompilerSpecificFiles -Context $context 
+        if($context){
+           Pop-CompilerSpecificFiles -Context $context 
+        }
     }
 }
 

scripts/matrix_testing/Get-CompilerSpecificFiles.ps1

@@ -6,9 +6,11 @@ function Get-CompilerSpecificFiles {
         [Parameter(Mandatory)] 
         [ValidateSet('c', 'cpp')]
         [string]
+        $Language,
+        [Parameter(Mandatory)] 
+        [string]
         $TestDirectory
-    )
-
+        )
     #
     # Convention is as follows:
     #
@@ -19,9 +21,16 @@ function Get-CompilerSpecificFiles {
     #
     # file.expected is used for all compilers 
     # file.expected.<configuration> is used for <configuration> 
-    $sourceFiles = Get-ChildItem -Filter "*.$Language.$Configuration"
+    Write-Host "Scanning for compiler specific files in $TestDirectory"
+
+    foreach($f in (Get-ChildItem -Filter "*.$Language.$Configuration" $TestDirectory)){
+        Write-Host "Found file $f..."
+        $f
+    }
 
-    $expectedFiles = Get-ChildItem -Filter "*.expected.$Configuration"
+    foreach($f in (Get-ChildItem -Filter "*.expected.$Configuration" $TestDirectory)){
+        Write-Host "Found file $f..."
+        $f 
+    }
 
-    return $sourceFiles + $expectedFiles
 }

scripts/matrix_testing/NewDatabaseForRule.ps1

@@ -21,7 +21,7 @@ function New-Database-For-Rule {
 
     Write-Host "Creating Database for Rule $RuleName..."
 
-    $cppFiles = Get-ChildItem $RuleTestDir/*.c*
+    $cppFiles = Get-ChildItem $RuleTestDir/*.$Language
     $cppFilesString = ([String]::Join(' ', $cppFiles))
     Write-Host "Found '.cpp' files $cppFilesString."
 

scripts/matrix_testing/Pop-CompilerSpecificFiles.ps1

@@ -9,13 +9,13 @@ function Pop-CompilerSpecificFiles {
         $origin = $context.origin 
         $temp   = $context.temp 
 
-        if(-Not $temp -eq $null){
+        if($temp){
             Write-Host "Restoring $temp -> $origin"
-            Move-Item -Force -Path $temp $origin
+            Copy-Item -Force -Path $temp -Destination $origin
         }else {
             # otherwise we just need to delete the origin 
             Write-Host "Removing unneeded context item $origin"
-            Remove-Item -Force $origin
+            Remove-Item -Force $origin 
         }
     }
 

scripts/matrix_testing/Push-CompilerSpecificFiles.ps1

@@ -10,12 +10,8 @@ function Push-CompilerSpecificFiles {
         $Language 
     )
 
-    $context = @() 
-
-
     # for each file, move it to a temporary location
     foreach($f in $FileSet){
-
         # 
         # Convention is as follows:
         #
@@ -35,27 +31,30 @@ function Push-CompilerSpecificFiles {
         # file afterwards. 
 
         # transform the compiler specific file to the generic one
-        $originFile = Get-Item $f.FullName.Replace(".$Configuration", "")
+        $originFilePath = $f.FullName.Replace(".$Configuration", "")
 
         # IF it exists, copy the originFile to a temp location and replace it 
         # with the specific file. 
-        if($originFile.Exists){
+        if(Test-Path $originFilePath){
+
+            $originFile = Get-Item $originFilePath 
+
             Write-Host "Moving generic file $originFile to $tmp..."
             Move-Item -Force -Path $originFile -Destination $tmp 
             Write-Host "Copying $f to generic file $originFile"
-            Copy-Item -Path $f -Destination $originFile
+            Copy-Item -Path $f -Destination $originFile 
 
-            $context += @{"origin"=$originFile; "temp"=$tmp;}
+            @{"origin"=$originFile; "temp"=$tmp;}
         }else{
+
+            $originFile = New-Item $originFilePath
+
             Write-Host "Copying $f to generic file $originFile"
-            Copy-Item -Path $f -Destination $originFile
+            Copy-Item -Path $f -Destination $originFile 
 
-            # we set $temp to $null since we don't want to copy anything 
+            #we set $temp to $null since we don't want to copy anything 
             # back 
-            $context += @{"origin"=$originFile; "temp"=$null;}
+            @{"origin"=$originFile; "temp"=$null;}
         }
     }
-
-    return $context 
-
 }