Skip to content

Commit

Permalink
[GR-59265] Add the @theory annotation to the list of annotations used…
Browse files Browse the repository at this point in the history
… to recognize test classes for mx unittest.

PullRequest: mx/1846
  • Loading branch information
jchalou committed Oct 21, 2024
2 parents aebcb43 + 179b587 commit f51e183
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions ci/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,15 @@ local common_json = import "../common.json";
} else {},
},

wasm:: {
downloads+: {
WABT_DIR: {name: 'wabt', version: '1.0.36', platformspecific: true},
},
environment+: {
WABT_DIR: '$WABT_DIR/bin',
},
},

fastr:: {
# Note: On both Linux and MacOS, FastR depends on the gnur module and on gfortran
# of a specific version (4.8.5 on Linux, 10.2.0 on MacOS)
Expand Down
2 changes: 1 addition & 1 deletion common.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
],

"mx_version": "7.33.0",
"mx_version": "7.33.1",

"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
"jdks": {
Expand Down
2 changes: 1 addition & 1 deletion src/mx/_impl/mx.py
Original file line number Diff line number Diff line change
Expand Up @@ -18215,7 +18215,7 @@ def alarm_handler(signum, frame):
_CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache'))

# The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
version = VersionSpec("7.33.1") # [GR-58116] Filter out incomplete JsonArrayRule datapoints, add all_command_line_args_are_vm_args to VmBenchmarkSuite
version = VersionSpec("7.33.2") # [GR-59265] Mx Unittest Can't Find test Classes With @Theory Annotation Only

_mx_start_datetime = datetime.utcnow()

Expand Down
2 changes: 1 addition & 1 deletion src/mx/_impl/mx_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ def __call__(self, parser, namespace, values, option_string=None):
junit_args.append('-JUnitJsonResults')
junit_args.append(test_results)
try:
_unittest(args, ['@Test', '@Parameters'], junit_args, **parsed_args.__dict__)
_unittest(args, ['@Theory', '@Test', '@Parameters'], junit_args, **parsed_args.__dict__)
if make_test_report:
from . import mx_gate
assert 'task' in test_report_tags, 'Task tag is mandatory'
Expand Down

0 comments on commit f51e183

Please sign in to comment.