diff options
Diffstat (limited to 'test/testrunner/testrunner.py')
| -rwxr-xr-x | test/testrunner/testrunner.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index 77ef25a75b..344507115b 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -147,7 +147,7 @@ def gather_test_info(): VARIANT_TYPE_DICT['relocate'] = {'relocate-npatchoat', 'relocate', 'no-relocate'} VARIANT_TYPE_DICT['jni'] = {'jni', 'forcecopy', 'checkjni'} VARIANT_TYPE_DICT['address_sizes'] = {'64', '32'} - VARIANT_TYPE_DICT['jvmti'] = {'no-jvmti', 'jvmti-stress'} + VARIANT_TYPE_DICT['jvmti'] = {'no-jvmti', 'jvmti-stress', 'redefine-stress', 'trace-stress'} VARIANT_TYPE_DICT['compiler'] = {'interp-ac', 'interpreter', 'jit', 'optimizing', 'regalloc_gc', 'speed-profile'} @@ -437,7 +437,11 @@ def run_tests(tests): options_test += ' --debuggable' if jvmti == 'jvmti-stress': - options_test += ' --jvmti-stress' + options_test += ' --jvmti-trace-stress --jvmti-redefine-stress' + elif jvmti == 'trace-stress': + options_test += ' --jvmti-trace-stress' + elif jvmti == 'redefine-stress': + options_test += ' --jvmti-redefine-stress' if address_size == '64': options_test += ' --64' @@ -954,6 +958,10 @@ def parse_option(): IMAGE_TYPES.add('multipicimage') if options['jvmti_stress']: JVMTI_TYPES.add('jvmti-stress') + if options['redefine_stress']: + JVMTI_TYPES.add('redefine-stress') + if options['trace_stress']: + JVMTI_TYPES.add('trace-stress') if options['no_jvmti']: JVMTI_TYPES.add('no-jvmti') if options['verbose']: |