From 44e51aa11a4b8868d56c416b583a2cb8078d115f Mon Sep 17 00:00:00 2001 From: guwirth Date: Mon, 25 Apr 2016 22:19:34 +0200 Subject: [PATCH] use sonar-scanner V2.6 --- .travis.yml | 6 ++--- appveyor.yml | 10 +++---- .../src/test/resources/compiler/vc++13.txt | 6 ++--- .../features/importing_coverage.feature | 6 ++--- .../importing_cppcheck_reports.feature | 14 +++++----- .../features/multimodule_analysis.feature | 2 +- .../features/multimodule_analysis_2.feature | 2 +- integration-tests/features/smoketest.feature | 2 +- .../steps/test_execution_statistics.py | 4 +-- ...t_create_rules_and_bullseye_import.feature | 6 ++--- .../test_execution_statistics.feature | 26 +++++++++---------- .../run_analysis.msbuild | 2 +- .../testdata/cppcheck_project/Makefile | 2 +- .../run_analysis.msbuild | 2 +- .../testdata/smoketest_project/Makefile | 2 +- .../src/samples/SampleProject2/Makefile | 2 +- .../src/samples/SampleProject2/Readme | 2 +- 17 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.travis.yml b/.travis.yml index 355c99d7fd..d4e7f15929 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,8 @@ install: - unzip -qq sonarqube-5.4.zip - travis_retry wget -q https://sonarsource.bintray.com/Distribution/sonarqube/sonarqube-5.5-RC1.zip - unzip -qq sonarqube-5.5-RC1.zip - - travis_retry wget -q https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-2.5.1.zip - - unzip -qq sonar-scanner-2.5.1.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 - before_script: @@ -39,7 +39,7 @@ before_script: script: - mvn install -DskipTests=true - mvn test - - RAILS_ENV=production PATH=$PATH:/tmp/sonar-scanner-2.5.1/bin TestDataFolder=~/build/SonarOpenCommunity/sonar-cxx/integration-tests/testdata behave --no-capture + - RAILS_ENV=production PATH=$PATH:/tmp/sonar-scanner-2.6/bin TestDataFolder=~/build/SonarOpenCommunity/sonar-cxx/integration-tests/testdata behave --no-capture after_failure: - cat $SONARHOME/logs/sonar.log diff --git a/appveyor.yml b/appveyor.yml index 4fcf4e1d3c..6f06f82d36 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,12 +9,12 @@ install: ) [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven") } - if (!(Test-Path -Path "C:\sonar-runner" )) { + if (!(Test-Path -Path "C:\sonar-scanner" )) { (new-object System.Net.WebClient).DownloadFile( - 'https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-2.5.1.zip', - 'C:\sonar-runner-dist.zip' + 'https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-2.6.zip', + 'C:\sonar-scanner-dist.zip' ) - [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sonar-runner-dist.zip", "C:\sonar-runner") + [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sonar-scanner-dist.zip", "C:\sonar-scanner") } if (!(Test-Path -Path "C:\sonarqube-5.4" )) { (new-object System.Net.WebClient).DownloadFile( @@ -37,7 +37,7 @@ install: $env:VCVARS_PLATFORM="amd64" $env:LANG_PLATFORM="-x64" } - - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;C:\sonar-runner\sonar-scanner-2.5.1\bin;%PATH% + - 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-5.4\sonarqube-5.4 - cmd: SET TestDataFolder=C:\projects\sonar-cxx\integration-tests\testdata - cmd: SET diff --git a/cxx-squid/src/test/resources/compiler/vc++13.txt b/cxx-squid/src/test/resources/compiler/vc++13.txt index 8996b2df51..8fff9307b3 100644 --- a/cxx-squid/src/test/resources/compiler/vc++13.txt +++ b/cxx-squid/src/test/resources/compiler/vc++13.txt @@ -138,7 +138,7 @@ Done building target "GetReferenceAssemblyPaths" in project "PathHandling.vcxpro Target "SetBuildDefaultEnvironmentVariables" in file "C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.Cpp.targets" from project "C:\prod\SonarQube\cxx\sonar-cxx\integration-tests\testdata\googletest_bullseye_vs_project\PathHandling\PathHandling.vcxproj" (target "PrepareForBuild" depends on it): Using "SetEnv" task from assembly "C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.Build.CppTasks.Common.dll". Task "SetEnv" - PATH=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\tools;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\ide;C:\Program Files (x86)\HTML Help Workshop;;C:\Program Files (x86)\MSBuild\12.0\bin\;C:\Windows\Microsoft.NET\Framework\v4.0.30319\;C:\Windows\SysWow64;;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\3.1\Framework\v4.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0;C:\Program Files (x86)\MSBuild\12.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\CCM;C:\Windows\CCM;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\GitExtensions\;C:\Program Files (x86)\Seapine\TestTrack;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.4\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\Java\jdk1.8.0_31\bin;C:\sw\apache-maven-3.2.5\bin;C:\sw\sonar-runner-2.4\bin; + PATH=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\tools;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\ide;C:\Program Files (x86)\HTML Help Workshop;;C:\Program Files (x86)\MSBuild\12.0\bin\;C:\Windows\Microsoft.NET\Framework\v4.0.30319\;C:\Windows\SysWow64;;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\3.1\Framework\v4.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0;C:\Program Files (x86)\MSBuild\12.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\CCM;C:\Windows\CCM;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\GitExtensions\;C:\Program Files (x86)\Seapine\TestTrack;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.4\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\Java\jdk1.8.0_31\bin;C:\sw\apache-maven-3.2.5\bin;C:\sw\sonar-scanner-2.6\bin; Done executing task "SetEnv". Task "SetEnv" LIB=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\lib;C:\Program Files (x86)\Windows Kits\8.1\lib\winv6.3\um\x86;; @@ -658,7 +658,7 @@ Task "SetEnv" skipped, due to false condition; ('$(Platform.ToLower())' == 'win3 Task "SetEnv" skipped, due to false condition; ('$(Platform.ToLower())' == 'x64' And ( $(PlatformToolset.ToLower().IndexOf('v120')) > -1 Or '$(PlatformToolset.ToLower())' == 'windowskernelmodedriver8.0' Or '$(PlatformToolset.ToLower())' == 'windowsapplicationfordrivers8.0' Or '$(PlatformToolset.ToLower())' == 'windowsusermodedriver8.0' ) And '$(Linkage-gtestmock_redist.ToLower())' == 'dynamic') was evaluated as ('win32' == 'x64' And ( 0 > -1 Or 'v120' == 'windowskernelmodedriver8.0' Or 'v120' == 'windowsapplicationfordrivers8.0' Or 'v120' == 'windowsusermodedriver8.0' ) And 'dynamic' == 'dynamic'). Using "SetEnv" task from assembly "C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.Build.CppTasks.Common.dll". Task "SetEnv" - PATH=C:\prod\SonarQube\cxx\packages\gtestmock.redist.1.7.2\build\native\../..//build/native/bin/Win32\v120\dynamicC:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\3.1\Framework\v4.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0;C:\Program Files (x86)\MSBuild\12.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\CCM;C:\Windows\CCM;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\GitExtensions\;C:\Program Files (x86)\Seapine\TestTrack;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.4\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\Java\jdk1.8.0_31\bin;C:\sw\apache-maven-3.2.5\bin;C:\sw\sonar-runner-2.4\bin + PATH=C:\prod\SonarQube\cxx\packages\gtestmock.redist.1.7.2\build\native\../..//build/native/bin/Win32\v120\dynamicC:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\3.1\Framework\v4.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0;C:\Program Files (x86)\MSBuild\12.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\CCM;C:\Windows\CCM;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\GitExtensions\;C:\Program Files (x86)\Seapine\TestTrack;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.4\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\Java\jdk1.8.0_31\bin;C:\sw\apache-maven-3.2.5\bin;C:\sw\sonar-scanner-2.4\bin Done executing task "SetEnv". Task "SetEnv" skipped, due to false condition; ('$(Platform.ToLower())' == 'x64' And '$(PlatformToolset.ToLower())' == 'v140' And '$(Linkage-gtestmock_redist.ToLower())' == 'dynamic') was evaluated as ('win32' == 'x64' And 'v120' == 'v140' And 'dynamic' == 'dynamic'). Task "SetEnv" skipped, due to false condition; ('$(Platform.ToLower())' == 'win32' And '$(PlatformToolset.ToLower())' == 'v140' And '$(Linkage-gtestmock_redist.ToLower())' == 'dynamic') was evaluated as ('win32' == 'win32' And 'v120' == 'v140' And 'dynamic' == 'dynamic'). @@ -733,7 +733,7 @@ Task "GetReferenceAssemblyPaths" skipped, due to false condition; ('$(TargetFram Done building target "GetReferenceAssemblyPaths" in project "PathHandling.Test.vcxproj". Target "SetBuildDefaultEnvironmentVariables" in file "C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.Cpp.targets" from project "C:\prod\SonarQube\cxx\sonar-cxx\integration-tests\testdata\googletest_bullseye_vs_project\PathHandling.Test\PathHandling.Test.vcxproj" (target "PrepareForBuild" depends on it): Task "SetEnv" - PATH=C:\Program Files (x86)\BullseyeCoverage\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\tools;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\ide;C:\Program Files (x86)\HTML Help Workshop;;C:\Program Files (x86)\MSBuild\12.0\bin\;C:\Windows\Microsoft.NET\Framework\v4.0.30319\;C:\Windows\SysWow64;;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\3.1\Framework\v4.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0;C:\Program Files (x86)\MSBuild\12.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\CCM;C:\Windows\CCM;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\GitExtensions\;C:\Program Files (x86)\Seapine\TestTrack;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.4\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\Java\jdk1.8.0_31\bin;C:\sw\apache-maven-3.2.5\bin;C:\sw\sonar-runner-2.4\bin; + PATH=C:\Program Files (x86)\BullseyeCoverage\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\tools;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\ide;C:\Program Files (x86)\HTML Help Workshop;;C:\Program Files (x86)\MSBuild\12.0\bin\;C:\Windows\Microsoft.NET\Framework\v4.0.30319\;C:\Windows\SysWow64;;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\3.1\Framework\v4.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0;C:\Program Files (x86)\MSBuild\12.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\CCM;C:\Windows\CCM;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\GitExtensions\;C:\Program Files (x86)\Seapine\TestTrack;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.4\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\Java\jdk1.8.0_31\bin;C:\sw\apache-maven-3.2.5\bin;C:\sw\sonar-scanner-2.4\bin; Done executing task "SetEnv". Task "SetEnv" LIB=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\lib;C:\Program Files (x86)\Windows Kits\8.1\lib\winv6.3\um\x86;; diff --git a/integration-tests/features/importing_coverage.feature b/integration-tests/features/importing_coverage.feature index f98c44b74b..0d9db6f7c3 100644 --- a/integration-tests/features/importing_coverage.feature +++ b/integration-tests/features/importing_coverage.feature @@ -8,7 +8,7 @@ Feature: Importing coverage data Scenario: Importing coverage reports GIVEN the project "coverage_project" - WHEN I run sonar-runner with following options: + WHEN I run sonar-scanner with following options: """ -Dsonar.cxx.coverage.reportPath=ut-coverage.xml -Dsonar.cxx.coverage.itReportPath=it-coverage.xml @@ -39,7 +39,7 @@ Feature: Importing coverage data Scenario: Importing coverage reports zeroing coverage for untouched files GIVEN the project "coverage_project" - WHEN I run sonar-runner with following options: + WHEN I run sonar-scanner with following options: """ -Dsonar.cxx.coverage.reportPath=ut-coverage.xml -Dsonar.cxx.coverage.itReportPath=it-coverage.xml @@ -77,7 +77,7 @@ Feature: Importing coverage data GIVEN the project "coverage_project" - WHEN I run sonar-runner with following options: + WHEN I run sonar-scanner with following options: """ -Dsonar.cxx.coverage.reportPath=dummy.xml -Dsonar.cxx.coverage.itReportPath=dummy.xml diff --git a/integration-tests/features/importing_cppcheck_reports.feature b/integration-tests/features/importing_cppcheck_reports.feature index 1119eff407..1c6a834ebf 100644 --- a/integration-tests/features/importing_cppcheck_reports.feature +++ b/integration-tests/features/importing_cppcheck_reports.feature @@ -8,7 +8,7 @@ Feature: Importing Cppcheck reports Scenario Outline: Importing Cppcheck report(s) GIVEN the project "cppcheck_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.cppcheck.reportPath=" + WHEN I run "sonar-scanner -X -Dsonar.cxx.cppcheck.reportPath=" THEN the analysis finishes successfully AND the analysis in server has completed AND the server log (if locatable) contains no error/warning messages @@ -26,7 +26,7 @@ Feature: Importing Cppcheck reports Scenario: The reports are missing GIVEN the project "cppcheck_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.cppcheck.reportPath=empty.xml" + WHEN I run "sonar-scanner -X -Dsonar.cxx.cppcheck.reportPath=empty.xml" THEN the analysis finishes successfully AND the analysis in server has completed AND the server log (if locatable) contains no error/warning messages @@ -39,7 +39,7 @@ Feature: Importing Cppcheck reports @wip Scenario: The report mentions an unknown rule GIVEN the project "cppcheck_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.cppcheck.reportPath=rule_unknown.xml" + WHEN I run "sonar-scanner -X -Dsonar.cxx.cppcheck.reportPath=rule_unknown.xml" THEN the analysis finishes successfully AND the analysis in server has completed AND the server log (if locatable) contains no error/warning messages @@ -52,7 +52,7 @@ Feature: Importing Cppcheck reports Scenario Outline: The reports are invalid GIVEN the project "cppcheck_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.cppcheck.reportPath=" + WHEN I run "sonar-scanner -X -Dsonar.cxx.cppcheck.reportPath=" THEN the analysis finishes successfully AND the analysis in server has completed AND the server log (if locatable) contains no error/warning messages @@ -70,7 +70,7 @@ Feature: Importing Cppcheck reports Scenario: The reports use paths relative to directories listed in sonar.sources GIVEN the project "cppcheck_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.cppcheck.reportPath=relative-to-src.xml" + WHEN I run "sonar-scanner -X -Dsonar.cxx.cppcheck.reportPath=relative-to-src.xml" THEN the analysis finishes successfully AND the analysis in server has completed AND the server log (if locatable) contains no error/warning messages @@ -83,7 +83,7 @@ Feature: Importing Cppcheck reports Scenario: The reports and issues in the reports have absolute paths GIVEN the project "cppcheck_with_absolute_paths_project" and platform is not "Windows" - WHEN I run "sonar-runner -X" + WHEN I run "sonar-scanner -X" THEN the analysis finishes successfully AND the analysis in server has completed AND the server log (if locatable) contains no error/warning messages @@ -95,7 +95,7 @@ Feature: Importing Cppcheck reports # Scenario: The reports are outside the project directory # GIVEN the project "cppcheck_project" # AND a report outside the projects directory, e.g. "/tmp/cppcheck-v1.xml" - # WHEN I run "sonar-runner -X -Dsonar.cxx.cppcheck.reportPath=/tmp/cppcheck-v1.xml" + # WHEN I run "sonar-scanner -X -Dsonar.cxx.cppcheck.reportPath=/tmp/cppcheck-v1.xml" # THEN the analysis finishes successfully # AND the analysis in server has completed # AND the server log (if locatable) contains no error/warning messages diff --git a/integration-tests/features/multimodule_analysis.feature b/integration-tests/features/multimodule_analysis.feature index 46b961f37a..9606a46670 100644 --- a/integration-tests/features/multimodule_analysis.feature +++ b/integration-tests/features/multimodule_analysis.feature @@ -4,7 +4,7 @@ Feature: cpp-multimodule-project Scenario: cpp-multimodule-project GIVEN the project "cpp-multimodule-project" - WHEN I run "sonar-runner -X" + WHEN I run "sonar-scanner -X" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: diff --git a/integration-tests/features/multimodule_analysis_2.feature b/integration-tests/features/multimodule_analysis_2.feature index 07a2d45ffc..03bf9e3b55 100644 --- a/integration-tests/features/multimodule_analysis_2.feature +++ b/integration-tests/features/multimodule_analysis_2.feature @@ -7,7 +7,7 @@ Feature: cpp-multimodule-project GIVEN the project "cpp-multimodule-project-2" and platform is not "Windows" - WHEN I run "sonar-runner -X" + WHEN I run "sonar-scanner -X" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: diff --git a/integration-tests/features/smoketest.feature b/integration-tests/features/smoketest.feature index 5c13529ef1..1039f84878 100644 --- a/integration-tests/features/smoketest.feature +++ b/integration-tests/features/smoketest.feature @@ -5,7 +5,7 @@ Feature: Smoketest Scenario: Smoketest GIVEN the project "smoketest_project" - WHEN I run "sonar-runner" + WHEN I run "sonar-scanner" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: diff --git a/integration-tests/features/steps/test_execution_statistics.py b/integration-tests/features/steps/test_execution_statistics.py index 2d48b4c4ae..dfd0461316 100644 --- a/integration-tests/features/steps/test_execution_statistics.py +++ b/integration-tests/features/steps/test_execution_statistics.py @@ -284,10 +284,10 @@ def step_impl(context): shutil.copyfile(source, target) -@when(u'I run sonar-runner with following options') +@when(u'I run sonar-scanner with following options') def step_impl(context): arguments = [line for line in context.text.split("\n") if line != ''] - command = "sonar-runner " + " ".join(arguments) + command = "sonar-scanner " + " ".join(arguments) _run_command(context, command) diff --git a/integration-tests/features/test_create_rules_and_bullseye_import.feature b/integration-tests/features/test_create_rules_and_bullseye_import.feature index 7dd5886252..90e2e48d53 100644 --- a/integration-tests/features/test_create_rules_and_bullseye_import.feature +++ b/integration-tests/features/test_create_rules_and_bullseye_import.feature @@ -1,7 +1,7 @@ Feature: GoogleTestWithBullseyeAndVsProject - This test verifies that analysis is able to import bullseye coverage reports and import custom rules reports. - Custom rules are created using Rest API, after test ends rules are deleted. + This test verifies that analysis is able to import bullseye coverage reports and import custom rules reports. + Custom rules are created using Rest API, after test ends rules are deleted. Bullseye reports need to be created before running the test. Scenario: GoogleTestWithBullseyeAndVsProject @@ -13,7 +13,7 @@ Feature: GoogleTestWithBullseyeAndVsProject and rule "cpplint_whitespace_parens_5" is created based on "other:CustomRuleTemplate" in repository "other" and rule "cpplint_whitespace_line_length_1" is created based on "other:CustomRuleTemplate" in repository "other" and rule "cpplint_tekla_custom_include_files_0" is created based on "other:CustomRuleTemplate" in repository "other" - WHEN I run "sonar-runner -X" + WHEN I run "sonar-scanner -X" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: diff --git a/integration-tests/features/test_execution_statistics.feature b/integration-tests/features/test_execution_statistics.feature index 46b858ac7d..2aed862929 100644 --- a/integration-tests/features/test_execution_statistics.feature +++ b/integration-tests/features/test_execution_statistics.feature @@ -54,7 +54,7 @@ Feature: Providing test execution numbers GIVEN the project "googletest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath=gtest_without_fixture.xml" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath=gtest_without_fixture.xml" THEN the analysis finishes successfully AND the analysis in server has completed @@ -82,7 +82,7 @@ Feature: Providing test execution numbers in the AST'-approach. This doesn't work for all testcases, though GIVEN the project "googletest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: @@ -110,7 +110,7 @@ Feature: Providing test execution numbers see above... this is the case where it doesnt work GIVEN the project "googletest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: @@ -136,7 +136,7 @@ Feature: Providing test execution numbers Importing in detailled mode isnt possible unless sonar.tests is set GIVEN the project "googletest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true -Dsonar.tests=" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true -Dsonar.tests=" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains a line matching: @@ -159,7 +159,7 @@ Feature: Providing test execution numbers correct source code files. GIVEN the project "googletest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath=" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath=" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: @@ -186,7 +186,7 @@ Feature: Providing test execution numbers Scenario Outline: googletest reports cannot be found or are empty GIVEN the project "googletest_project" - WHEN I run "sonar-runner -Dsonar.cxx.xunit.reportPath=" + WHEN I run "sonar-scanner -Dsonar.cxx.xunit.reportPath=" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: @@ -214,7 +214,7 @@ Feature: Providing test execution numbers Scenario: googletest report is invalid GIVEN the project "googletest_project" - WHEN I run "sonar-runner -Dsonar.cxx.xunit.reportPath=invalid_report.xml" + WHEN I run "sonar-scanner -Dsonar.cxx.xunit.reportPath=invalid_report.xml" THEN the analysis breaks AND the analysis log contains a line matching: """ @@ -235,7 +235,7 @@ Feature: Providing test execution numbers GIVEN the project "boosttest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath=btest_test_simple-test_suite.xml" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath=btest_test_simple-test_suite.xml" THEN the analysis finishes successfully AND the analysis in server has completed @@ -261,7 +261,7 @@ Feature: Providing test execution numbers GIVEN the project "boosttest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath=btest_test_nested-test_suite.xml" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath=btest_test_nested-test_suite.xml" THEN the analysis finishes successfully AND the analysis in server has completed @@ -288,7 +288,7 @@ Feature: Providing test execution numbers GIVEN the project "boosttest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.xsltURL=boosttest-1.x-to-junit-dummy-1.0.xsl -Dsonar.tests=cxx-xunit -Dsonar.cxx.xunit.provideDetails=true -Dsonar.cxx.xunit.reportPath=btest_test_nested-test_suite.xml" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.xsltURL=boosttest-1.x-to-junit-dummy-1.0.xsl -Dsonar.tests=cxx-xunit -Dsonar.cxx.xunit.provideDetails=true -Dsonar.cxx.xunit.reportPath=btest_test_nested-test_suite.xml" THEN the analysis finishes successfully AND the analysis in server has completed @@ -314,7 +314,7 @@ Feature: Providing test execution numbers GIVEN the project "boosttest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: @@ -350,7 +350,7 @@ Feature: Providing test execution numbers GIVEN the project "boosttest_project" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath= -Dsonar.cxx.xunit.provideDetails=true" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: @@ -382,7 +382,7 @@ Feature: Providing test execution numbers GIVEN the project "boosttest_project" and platform is not "Windows" - WHEN I run "sonar-runner -X -Dsonar.cxx.xunit.reportPath=btest_test_nested-test_suite.xml -Dsonar.cxx.xunit.provideDetails=true -Dsonar.cxx.includeDirectories=/usr/include" + WHEN I run "sonar-scanner -X -Dsonar.cxx.xunit.reportPath=btest_test_nested-test_suite.xml -Dsonar.cxx.xunit.provideDetails=true -Dsonar.cxx.includeDirectories=/usr/include" THEN the analysis finishes successfully AND the analysis in server has completed AND the analysis log contains no error/warning messages except those matching: diff --git a/integration-tests/testdata/cpp-multimodule-project/run_analysis.msbuild b/integration-tests/testdata/cpp-multimodule-project/run_analysis.msbuild index dbba4b6a48..268f878611 100644 --- a/integration-tests/testdata/cpp-multimodule-project/run_analysis.msbuild +++ b/integration-tests/testdata/cpp-multimodule-project/run_analysis.msbuild @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/integration-tests/testdata/cppcheck_project/Makefile b/integration-tests/testdata/cppcheck_project/Makefile index 20f7c781bb..f6780ebd21 100644 --- a/integration-tests/testdata/cppcheck_project/Makefile +++ b/integration-tests/testdata/cppcheck_project/Makefile @@ -22,4 +22,4 @@ cppcheck_relative_to_src: cd src; cppcheck -v --enable=all --xml --xml-version=1 . -I. 2> ../relative-to-src.xml; cd - sonar_sonar: - sonar-runner -X + sonar-scanner -X diff --git a/integration-tests/testdata/googletest_bullseye_vs_project/run_analysis.msbuild b/integration-tests/testdata/googletest_bullseye_vs_project/run_analysis.msbuild index a6fea38226..143600f1e8 100644 --- a/integration-tests/testdata/googletest_bullseye_vs_project/run_analysis.msbuild +++ b/integration-tests/testdata/googletest_bullseye_vs_project/run_analysis.msbuild @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/integration-tests/testdata/smoketest_project/Makefile b/integration-tests/testdata/smoketest_project/Makefile index 3920cf0912..38c40aba6f 100644 --- a/integration-tests/testdata/smoketest_project/Makefile +++ b/integration-tests/testdata/smoketest_project/Makefile @@ -45,4 +45,4 @@ sonar_coverage: # Parse collected data and feed it into sonar sonar_sonar: - sonar-runner -X + sonar-scanner -X diff --git a/sonar-cxx-plugin/src/samples/SampleProject2/Makefile b/sonar-cxx-plugin/src/samples/SampleProject2/Makefile index a041dbd1c5..7e055ac48c 100644 --- a/sonar-cxx-plugin/src/samples/SampleProject2/Makefile +++ b/sonar-cxx-plugin/src/samples/SampleProject2/Makefile @@ -53,4 +53,4 @@ sonar_coverage: # Parse collected data and feed it into sonar sonar_sonar: - sonar-runner -X + sonar-scanner -X diff --git a/sonar-cxx-plugin/src/samples/SampleProject2/Readme b/sonar-cxx-plugin/src/samples/SampleProject2/Readme index 9034fce3db..150596329c 100644 --- a/sonar-cxx-plugin/src/samples/SampleProject2/Readme +++ b/sonar-cxx-plugin/src/samples/SampleProject2/Readme @@ -19,7 +19,7 @@ with your code. It assumes following software to be installed: - gcc - make -- java, sonar-runner +- java, sonar-scanner - cppcheck - valgrind - Python, gcovr.py