Skip to content

Commit 83badae

Browse files
ansalondansalond
committed
Move tests.
1 parent 20c418c commit 83badae

File tree

3 files changed

+0
-316
lines changed

3 files changed

+0
-316
lines changed

‎ci.jsonnet

-64
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,6 @@ local base = {
125125
}
126126
};
127127

128-
local gate_coverage(allow_warnings) = base.eclipse + {
129-
setup+: [
130-
['mx', 'sversions'],
131-
],
132-
run+: [
133-
['mx', '--jacoco-whitelist-package', 'com.oracle.truffle.espresso', '--jacoco-exclude-annotation', '@GeneratedBy', '--strict-compliance', 'gate', '--strict-mode', '--tags', '${GATE_TAGS}', '--jacocout', 'html'] + ( if allow_warnings then ['--no-warning-as-error'] else []),
134-
['mx', '--jacoco-whitelist-package', 'com.oracle.truffle.espresso', '--jacoco-exclude-annotation', '@GeneratedBy', 'sonarqube-upload', "-Dsonar.host.url=$SONAR_HOST_URL", "-Dsonar.projectKey=com.oracle.truffle.espresso", "-Dsonar.projectName=GraalVM - Espresso", '--exclude-generated'],
135-
['mx', '--jacoco-whitelist-package', 'com.oracle.truffle.espresso', '--jacoco-exclude-annotation', '@GeneratedBy', 'coverage-upload']
136-
],
137-
timelimit: '30:00',
138-
};
139-
140128
local gate_cmd = ['mx', '--strict-compliance', 'gate', '--strict-mode', '--tags', '${GATE_TAGS}'];
141129

142130
local gate_espresso(allow_warnings) = {
@@ -257,14 +245,6 @@ local scala_dacapo_warmup_benchmark(env, guest_jvm_config='default', extra_args=
257245
extra_args=extra_args
258246
);
259247

260-
local smoke_tests(env) =
261-
clone_build_run(env, hello_world_args) +
262-
if std.startsWith(env, 'jvm') then {} else {
263-
run+: [
264-
_mx(env, ['--strict-compliance', 'gate', '--strict-mode', '--tags', 'exit']),
265-
],
266-
};
267-
268248
# GraalVM Installables
269249
local graalvm_installables(ee, windows) = {
270250
local dynamic_imports = if ee then '/vm-enterprise,/substratevm-enterprise,/tools-enterprise' else '/vm,/substratevm,/tools',
@@ -332,14 +312,6 @@ local awfy = 'awfy:*';
332312

333313
{
334314
builds: [
335-
// JaCoCo coverage (disabled)
336-
// jdk8_weekly_linux + gate_coverage(allow_warnings=true) + { environment+: {
337-
// GATE_TAGS: 'build,unittest',
338-
// DYNAMIC_IMPORTS: '/vm,truffleruby'
339-
// },
340-
// name: 'espresso-gate-coverage-jdk8-linux-amd64'
341-
// },
342-
343315
// Gates
344316
jdk8_gate_linux + base.extra_jdk11_ce + gate_espresso(allow_warnings=false) + { environment+: {
345317
GATE_TAGS: 'jackpot'
@@ -353,42 +325,6 @@ local awfy = 'awfy:*';
353325
name: 'espresso-gate-style-fullbuild-jdk8-linux-amd64'
354326
},
355327

356-
jdk8_gate_linux + gate_espresso(allow_warnings=true) + { environment+: {
357-
GATE_TAGS: 'build,unittest',
358-
DYNAMIC_IMPORTS: '/vm,truffleruby'
359-
},
360-
name: 'espresso-gate-unittest-jdk8-linux-amd64'
361-
},
362-
363-
jdk8_daily_linux + gate_espresso(allow_warnings=true) + { environment+: {
364-
GATE_TAGS: 'build,unittest_with_compilation',
365-
DYNAMIC_IMPORTS: '/vm,truffleruby,/compiler'
366-
},
367-
timelimit: '1:00:00',
368-
name: 'espresso-gate-unittest-compilation-jdk8-linux-amd64'
369-
},
370-
371-
// LD_DEBUG=unused is a workaround for: symbol lookup error: jre/lib/amd64/libnio.so: undefined symbol: fstatat64
372-
jdk8_gate_linux + gate_espresso(allow_warnings=false) + { environment+: {
373-
GATE_TAGS: 'build,meta',
374-
LD_DEBUG: 'unused'
375-
},
376-
name: 'espresso-meta-hello-world-linux-amd64'
377-
},
378-
379-
// Hello World! should run in all supported configurations.
380-
jdk8_gate_linux + smoke_tests('jvm-ce') + {name: 'espresso-gate-jvm-ce-hello-world-jdk8-linux-amd64'},
381-
jdk8_gate_linux + smoke_tests('native-ce') + {name: 'espresso-gate-native-ce-hello-world-jdk8-linux-amd64'},
382-
jdk8_gate_linux + smoke_tests('native-ee') + {name: 'espresso-gate-native-ee-hello-world-jdk8-linux-amd64'},
383-
jdk8_gate_darwin + smoke_tests('native-ce') + {name: 'espresso-gate-native-ce-hello-world-jdk8-darwin-amd64'},
384-
jdk8_gate_darwin + smoke_tests('native-ee') + {name: 'espresso-gate-native-ee-hello-world-jdk8-darwin-amd64'},
385-
jdk8_gate_windows + smoke_tests('native-ce') + {name: 'espresso-gate-native-ce-hello-world-jdk8-windows-amd64'},
386-
jdk8_gate_windows + smoke_tests('native-ee') + {name: 'espresso-gate-native-ee-hello-world-jdk8-windows-amd64'},
387-
jdk11_gate_linux + smoke_tests('jvm-ce') + {name: 'espresso-gate-jvm-ce-hello-world-jdk11-linux-amd64'},
388-
jdk11_gate_linux + smoke_tests('native-ce') + {name: 'espresso-gate-native-ce-hello-world-jdk11-linux-amd64'},
389-
jdk11_gate_linux + smoke_tests('native-ee') + {name: 'espresso-gate-native-ee-hello-world-jdk11-linux-amd64'},
390-
jdk11_gate_windows + smoke_tests('native-ee') + {name: 'espresso-gate-native-ee-hello-world-jdk11-windows-amd64'},
391-
392328
// AWFY peak perf. benchmarks (post-merge)
393329
jdk8_bench_linux + espresso_benchmark('jvm-ce', awfy) + {name: 'espresso-bench-jvm-ce-awfy-jdk8-linux-amd64'},
394330
jdk8_bench_linux + espresso_benchmark('jvm-ee', awfy) + {name: 'espresso-bench-jvm-ee-awfy-jdk8-linux-amd64'},

‎mx.espresso/mx_espresso.py

-62
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@
2121
# questions.
2222
#
2323

24-
from argparse import ArgumentParser
25-
2624
import os
2725

2826
import mx
2927
import mx_espresso_benchmarks # pylint: disable=unused-import
3028
import mx_sdk_vm
3129
from mx_gate import Task, add_gate_runner
3230
from mx_jackpot import jackpot
33-
from mx_unittest import unittest
3431

3532

3633
_suite = mx.suite('espresso')
@@ -84,76 +81,18 @@ def _run_espresso_meta(args, nonZeroIsFatal=True):
8481
return _run_espresso_launcher(['--vm.Xss4m'] + _espresso_standalone_command(args), nonZeroIsFatal=nonZeroIsFatal)
8582

8683

87-
def _run_espresso_playground(args):
88-
"""Run Espresso test programs"""
89-
parser = ArgumentParser(prog='mx espresso-playground')
90-
parser.add_argument('main_class', action='store', help='Unqualified class name to run.')
91-
parser.add_argument('main_class_args', nargs='*')
92-
args = parser.parse_args(args)
93-
return _run_espresso_launcher(['-cp', mx.classpath('ESPRESSO_PLAYGROUND'),
94-
'com.oracle.truffle.espresso.playground.' + args.main_class]
95-
+ args.main_class_args)
96-
97-
9884
class EspressoDefaultTags:
99-
unittest = 'unittest'
100-
unittest_with_compilation = 'unittest_with_compilation'
10185
jackpot = 'jackpot'
10286
meta = 'meta'
10387
exit = 'exit'
10488

10589

10690
def _espresso_gate_runner(args, tasks):
107-
with Task('UnitTestsWithCompilation', tasks, tags=[EspressoDefaultTags.unittest_with_compilation]) as t:
108-
if t:
109-
unittest(['--enable-timing', '--very-verbose', '--suite', 'espresso',
110-
'--', # pass VM options
111-
'-Dpolyglot.engine.CompileImmediately=true',
112-
'-Dpolyglot.engine.BackgroundCompilation=false',
113-
'-Dpolyglot.engine.CompileOnly=espresso',
114-
'-Dpolyglot.engine.EncodedGraphCacheCapacity=-1', # unbounded
115-
# '-Dgraal.TraceTruffleCompilation=true', # Too verbose
116-
])
117-
118-
with Task('UnitTests', tasks, tags=[EspressoDefaultTags.unittest]) as t:
119-
if t:
120-
unittest(['--enable-timing', '--very-verbose', '--suite', 'espresso'])
121-
12291
# Jackpot configuration is inherited from Truffle.
12392
with Task('Jackpot', tasks, tags=[EspressoDefaultTags.jackpot]) as t:
12493
if t:
12594
jackpot(['--fail-on-warnings'], suite=None, nonZeroIsFatal=True)
12695

127-
with Task('Meta', tasks, tags=[EspressoDefaultTags.meta]) as t:
128-
if t:
129-
_run_espresso_meta(args=['-cp', mx.classpath('ESPRESSO_PLAYGROUND'), 'com.oracle.truffle.espresso.playground.HelloWorld'])
130-
131-
with Task('Exit', tasks, tags=[EspressoDefaultTags.exit]) as t:
132-
if t:
133-
def _run_exit(case, expected, daemon=False, wait='infinite-listen'):
134-
if isinstance(expected, int):
135-
expected = [expected]
136-
mx.log("Exit test [{}, daemon={}, wait={}]...".format(case, daemon, wait))
137-
rc = _run_espresso_java(args=['-cp', mx.classpath('ESPRESSO_PLAYGROUND'),
138-
'-Despresso.playground.exit.daemon=' + ('true' if daemon else 'false'),
139-
'-Despresso.playground.exit.static=' + ('true' if case == 'STATIC' else 'false'),
140-
'-Despresso.playground.exit.wait=' + wait,
141-
'com.oracle.truffle.espresso.playground.Exit', case], nonZeroIsFatal=False)
142-
if rc not in expected:
143-
raise mx.abort("Exit[{}, daemon={}, wait={}] Expected exit code in {}, got {}".format(case, daemon, wait, expected, rc))
144-
145-
_run_exit('STATIC', 11)
146-
_run_exit('MAIN', 12)
147-
_run_exit('MAIN_FALL', 0)
148-
_run_exit('OTHER_FALL', 13)
149-
_run_exit('OTHER_FALL', [13, 0], daemon=True)
150-
_run_exit('OTHER_WAIT', 14)
151-
_run_exit('OTHER_WAIT', 14, daemon=True)
152-
_run_exit('OTHER_WAIT', 14, wait='infinite-park')
153-
_run_exit('MAIN_OTHER', 15)
154-
_run_exit('MAIN_OTHER', 15, daemon=True)
155-
_run_exit('MAIN_OTHER', 15, wait='infinite-park')
156-
15796

15897
def verify_ci(args):
15998
"""Verify CI configuration"""
@@ -255,7 +194,6 @@ def verify_ci(args):
255194
'espresso-standalone': [_run_espresso_standalone, '[args]'],
256195
'espresso-java': [_run_espresso_java, '[args]'],
257196
'espresso-meta': [_run_espresso_meta, '[args]'],
258-
'espresso-playground': [_run_espresso_playground, '[class_name] [args]'],
259197
'verify-ci' : [verify_ci, '[options]'],
260198
})
261199

0 commit comments

Comments
 (0)