Merge pull request #37 from xoviat/sonar

Tests: FIXUP sonarqubed functionality.

Author: xoviat

appveyor.yml

@@ -119,6 +119,8 @@ on_finish:
         "https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)",
         (Resolve-Path .\junit-results.xml)
       )
+    
+  - "%CMD_IN_ENV% python tests/scripts/appveyor/fixup_wrapper.py sonar/build-wrapper-dump.json"
   - ps: |
       if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) {
         sonar-scanner `

tests/scripts/appveyor/fixup_wrappper.py

@@ -0,0 +1,19 @@
+import sys
+import json
+
+wrapper_file = open(sys.argv[1], 'r+')
+
+line = '#'
+while line.startswith('#'):
+    pos = wrapper_file.tell()
+    line = wrapper_file.readline()
+    
+wrapper_file.seek(pos)
+
+wrapper = json.loads(wrapper_file.read())
+
+for i in range(len(wrapper['captures'])):
+    wrapper['captures'][i]['stdout'] = wrapper['captures'][0]['stdout']
+    wrapper['captures'][i]['stderr'] = wrapper['captures'][0]['stderr']
+
+wrapper_file.write(json.dumps(wrapper))