fix report paths for sonar

.circleci/config.yml

@@ -54,6 +54,8 @@ jobs:
           cue -t sonar run-tests
           popd > /dev/null
 
+          ls -lh sonar-cloud/*/*
+
       # Scan and upload reports
       - sonarcloud/scan
 

ci/test/suite.cue

@@ -7,9 +7,10 @@ package test
 
 #Tester: {
 	name: string
+	lang: string
 	type: string
 
-	pass: bool | *false
+	skip: bool | *false
 
 	dir: string
 	cmd: string
@@ -24,13 +25,15 @@ Suites: #Suites & {
 
 	st: {
 		cli: {
-			pass: true
+			skip: true
+			lang: "go"
 			type: "testsuite"
 			dir: "lib/structural"
 			cmd: "go test ./"
 		}
 
 		unit: {
+			lang: "go"
 			type: "gotest"
 			dir: "lib/structural"
 			cmd: "go test ./ -v -covermode=count"
@@ -41,13 +44,15 @@ Suites: #Suites & {
 
 	mod: {
 		cli: {
+			lang: "go"
 			type: "testsuite"
 			dir: "lib/mod"
 			cmd: "go test ./"
 		}
 
 		unit: {
-			pass: true
+			skip: true
+			lang: "go"
 			type: "gotest"
 			dir: "lib/mod"
 			cmd: "go test ./ -v -covermode=count"

ci/test/test_tool.cue

@@ -73,7 +73,7 @@ command: "run-tests": {
 	data: f
 
 	for i, d in data {
-		if d.pass == false {
+		if d.skip == false {
 
 			// run tests in normal mode
 			if #Flags.sonar == "" {
@@ -102,13 +102,13 @@ command: "run-tests": {
 
 						pushd ../../ >/dev/null
 
-						mkdir -p sonar-cloud/\(d.name)
+						mkdir -p sonar-cloud/\(d.lang)/\(d.name)
 
 						pushd \(d.dir) > /dev/null
 						\(d.sonar)
 						popd > /dev/null
 
-						cp \(d.dir)/{cover,tests}.out sonar-cloud/\(d.name)
+						cp \(d.dir)/{cover,tests}.out sonar-cloud/\(d.lang)/\(d.name)
 
 						popd > /dev/null
 						"""

sonar-project.properties

@@ -14,5 +14,8 @@ sonar.host.url=https://sonarcloud.io
 #sonar.sources=.
 
 # Encoding of the source code. Default is default system encoding
-#sonar.sourceEncoding=UTF-8
+sonar.sourceEncoding=UTF-8
 
+# Go reports
+sonar.go.tests.reportPaths=sonar-reports/go/**
+sonar.go.coverage.reportPaths=sonar-reports/go/**