Skip to content

Commit 396d1c8

Browse files
committed
a bit of debugging output
1 parent 6bd96f2 commit 396d1c8

File tree

1 file changed

+29
-27
lines changed

1 file changed

+29
-27
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,37 +1215,39 @@ def mx_post_parse_cmd_line(namespace):
12151215

12161216
def python_coverage(args):
12171217
"Generate coverage report for our unittests"
1218+
os.system("which lcov")
1219+
os.system("which genhtml")
12181220
parser = ArgumentParser(prog='mx python-coverage')
12191221
parser.add_argument('--jacoco', action='store_true', help='do generate Jacoco coverage')
12201222
parser.add_argument('--truffle', action='store_true', help='do generate Truffle coverage')
12211223
parser.add_argument('--truffle-upload-url', help='Format is like rsync: user@host:/directory', default=None)
12221224
args = parser.parse_args(args)
12231225

1224-
# if args.jacoco:
1225-
# jacoco_args = [
1226-
# '--jacoco-whitelist-package', 'com.oracle.graal.python',
1227-
# # '--jacoco-exclude-annotation', '@GeneratedBy',
1228-
# ]
1229-
# mx.run_mx(jacoco_args + [
1230-
# '--strict-compliance',
1231-
# '--dynamicimports', '/compiler',
1232-
# '--primary', 'gate',
1233-
# '-B=--force-deprecation-as-warning-for-dependencies',
1234-
# '--strict-mode',
1235-
# '--tags', 'python-unittest,python-tagged-unittest,python-junit',
1236-
# '--jacocout', 'html',
1237-
# ])
1238-
# if mx.get_env("SONAR_HOST_URL", None):
1239-
# mx.run_mx(jacoco_args + [
1240-
# 'sonarqube-upload',
1241-
# '-Dsonar.host.url=%s' % mx.get_env("SONAR_HOST_URL"),
1242-
# '-Dsonar.projectKey=com.oracle.graalvm.python',
1243-
# '-Dsonar.projectName=GraalVM - Python',
1244-
# '--exclude-generated',
1245-
# ])
1246-
# mx.run_mx(jacoco_args + [
1247-
# 'coverage-upload',
1248-
# ])
1226+
if args.jacoco:
1227+
jacoco_args = [
1228+
'--jacoco-whitelist-package', 'com.oracle.graal.python',
1229+
# '--jacoco-exclude-annotation', '@GeneratedBy',
1230+
]
1231+
mx.run_mx(jacoco_args + [
1232+
'--strict-compliance',
1233+
'--dynamicimports', '/compiler',
1234+
'--primary', 'gate',
1235+
'-B=--force-deprecation-as-warning-for-dependencies',
1236+
'--strict-mode',
1237+
'--tags', 'python-unittest,python-tagged-unittest,python-junit',
1238+
'--jacocout', 'html',
1239+
])
1240+
if mx.get_env("SONAR_HOST_URL", None):
1241+
mx.run_mx(jacoco_args + [
1242+
'sonarqube-upload',
1243+
'-Dsonar.host.url=%s' % mx.get_env("SONAR_HOST_URL"),
1244+
'-Dsonar.projectKey=com.oracle.graalvm.python',
1245+
'-Dsonar.projectName=GraalVM - Python',
1246+
'--exclude-generated',
1247+
])
1248+
mx.run_mx(jacoco_args + [
1249+
'coverage-upload',
1250+
])
12491251
if args.truffle:
12501252
executable = python_gvm()
12511253
variants = [
@@ -1261,7 +1263,7 @@ def python_coverage(args):
12611263
outputlcov = "coverage.lcov"
12621264
if os.path.exists(outputlcov):
12631265
os.unlink(outputlcov)
1264-
cmdargs = ["lcov", "-o", outputlcov]
1266+
cmdargs = ["/usr/bin/env", "lcov", "-o", outputlcov]
12651267
for kwds in variants:
12661268
variant_str = re.sub(r"[^a-zA-Z]", "_", repr(kwds))
12671269
for pattern in ["py"]:
@@ -1292,7 +1294,7 @@ def python_coverage(args):
12921294
datetime.datetime.fromtimestamp(info['author-ts']).strftime('%Y-%m-%d_%H_%M'),
12931295
rev[:7],
12941296
)
1295-
mx.run(["genhtml", "-o", coverage_dir, outputlcov])
1297+
mx.run(["/usr/bin/env", "genhtml", "-o", coverage_dir, outputlcov])
12961298
if args.truffle_upload_url:
12971299
if not args.truffle_upload_url.endswith("/"):
12981300
args.truffle_upload_url = args.truffle_upload_url + "/"

0 commit comments

Comments
 (0)