Merge pull request #64 from emanuelschmoczer/update-for-Xcode-11

Update xccov-to-sonarqube-generic.sh for xcode 11
SonarSource · Oct 15, 2019 · 81dc6ca · 81dc6ca
2 parents cd12537 + 064d0be
commit 81dc6ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/swift-coverage/README.md b/swift-coverage/README.md
@@ -23,7 +23,8 @@ XCode version | Command
 --- | ---
 XCode 8+ - 9.2 | `xcrun llvm-cov show -instr-profile=Build/ProfileData/<device_id>/Coverage.profdata Build/Products/Debug/swift-coverage-example.app/Contents/MacOS/swift-coverage-example > Coverage.report`
 XCode 9.3 - 9.4.1 | `bash xccov-to-sonarqube-generic.sh Build/Logs/Test/*.xccovarchive/ > sonarqube-generic-coverage.xml`
-XCode 10+ | `bash xccov-to-sonarqube-generic.sh Build/Logs/Test/*.xcresult/*_Test/*.xccovarchive/ > sonarqube-generic-coverage.xml`
+XCode 10 | `bash xccov-to-sonarqube-generic.sh Build/Logs/Test/*.xcresult/*_Test/*.xccovarchive/ > sonarqube-generic-coverage.xml`
+XCode 11 | `bash xccov-to-sonarqube-generic.sh Build/Logs/Test/*.xcresult/ > sonarqube-generic-coverage.xml`
 
 1.c Import code coverage report
 

diff --git a/swift-coverage/swift-coverage-example/xccov-to-sonarqube-generic.sh b/swift-coverage/swift-coverage-example/xccov-to-sonarqube-generic.sh
@@ -4,8 +4,9 @@ set -euo pipefail
 function convert_file {
   local xccovarchive_file="$1"
   local file_name="$2"
+  local xccov_options="$3"
   echo "  <file path=\"$file_name\">"
-  xcrun xccov view --file "$file_name" "$xccovarchive_file" | \
+  xcrun xccov view $xccov_options --file "$file_name" "$xccovarchive_file" | \
     sed -n '
     s/^ *\([0-9][0-9]*\): 0.*$/    <lineToCover lineNumber="\1" covered="false"\/>/p;
     s/^ *\([0-9][0-9]*\): [1-9].*$/    <lineToCover lineNumber="\1" covered="true"\/>/p
@@ -16,8 +17,12 @@ function convert_file {
 function xccov_to_generic {
   echo '<coverage version="1">'
   for xccovarchive_file in "$@"; do
-    xcrun xccov view --file-list "$xccovarchive_file" | while read -r file_name; do
-      convert_file "$xccovarchive_file" "$file_name"
+    local xccov_options=""
+    if [[ $xccovarchive_file == *".xcresult"* ]]; then
+      xccov_options="--archive"
+    fi
+    xcrun xccov view $xccov_options --file-list "$xccovarchive_file" | while read -r file_name; do
+      convert_file "$xccovarchive_file" "$file_name" "$xccov_options"
     done
   done
   echo '</coverage>'