Merge pull request #870 from guwirth/test-sq-5.6-rc1

use SQ-5.6-RC1 for CI & testing

Author: guwirth

.travis.yml

@@ -4,7 +4,7 @@ jdk:
         - oraclejdk8
 
 env:
-        - SONARHOME=/tmp/sonarqube-5.5
+        - SONARHOME=/tmp/sonarqube-5.6-RC1
 
 matrix:
     fast_finished: true
@@ -22,8 +22,8 @@ before_install:
 
 install:
         - cd /tmp
-        - travis_retry wget -q https://sonarsource.bintray.com/Distribution/sonarqube/sonarqube-5.5.zip
-        - unzip -qq sonarqube-5.5.zip
+        - travis_retry wget -q https://sonarsource.bintray.com/Distribution/sonarqube/sonarqube-5.6-RC1.zip
+        - unzip -qq sonarqube-5.6-RC1.zip
         - travis_retry wget -q https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-2.6.zip
         - unzip -qq sonar-scanner-2.6.zip
         - cd -

appveyor.yml

@@ -18,10 +18,10 @@ install:
       }
       if (!(Test-Path -Path "C:\sonarqube" )) {
         (new-object System.Net.WebClient).DownloadFile(
-          'https://sonarsource.bintray.com/Distribution/sonarqube/sonarqube-5.5.zip',
-          'C:\sonarqube-5.5.zip'
+          'https://sonarsource.bintray.com/Distribution/sonarqube/sonarqube-5.6-RC1.zip',
+          'C:\sonarqube-5.6-RC1.zip'
         )
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sonarqube-5.5.zip", "C:\sonarqube")
+        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sonarqube-5.6-RC1.zip", "C:\sonarqube")
       }
   - ps: |
       If ($env:Platform -Match "x86") {
@@ -38,7 +38,7 @@ install:
         $env:LANG_PLATFORM="-x64"
       }	  
   - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;C:\sonar-scanner\sonar-scanner-2.6\bin;%PATH%
-  - cmd: SET SONARHOME=C:\sonarqube\sonarqube-5.5
+  - cmd: SET SONARHOME=C:\sonarqube\sonarqube-5.6-RC1
   - cmd: SET TestDataFolder=C:\projects\sonar-cxx\integration-tests\testdata
   - cmd: SET
 
@@ -66,5 +66,5 @@ on_failure:
   - ps: Get-ChildItem cxx-checks\target\surefire-reports\*.txt | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
   - ps: Get-ChildItem sonar-cxx-plugin\target\surefire-reports\*.txt | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
   - ps: Get-ChildItem *.log | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-  - ps: Get-ChildItem C:\sonarqube\sonarqube-5.5\logs\* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - ps: Get-ChildItem C:\sonarqube\sonarqube-5.6-RC1\logs\* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 

integration-tests/features/smoketest.feature

@@ -25,7 +25,7 @@ Feature: Smoketest
                | statements               | 36    |
                | classes                  | 1     |
                | files                    | 8     |
-               | directories              | 5     |
+               | directories              | 4     |
                | functions                | 5     |
                # comments / documentation
                | comment_lines_density    | 30    |

integration-tests/features/test_create_rules_and_bullseye_import.feature

@@ -34,7 +34,7 @@ Feature: GoogleTestWithBullseyeAndVsProject
                | statements               | 7     |
                | classes                  | 1     |
                | files                    | 2     |
-               | directories              | 2     |
+               | directories              | 1     |
                | functions                | 3     |
                # comments / documentation
                | comment_lines_density    | 0     |