Mercurial > hg > truffle

comparison mx/mx_graal.py @ 15917:7c84f0ce7cae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Mon, 26 May 2014 18:55:21 +0200
parents 6aa352b260f4 67e0015b21d6
children d676c4beeab8
comparison
equal deleted inserted replaced
15916:6aa352b260f4 15917:7c84f0ce7cae
968 for c in classes: 968 for c in classes:
969 f_testfile.write(c + '\n') 969 f_testfile.write(c + '\n')
970 f_testfile.close() 970 f_testfile.close()
971 harness(projectscp, vmArgs) 971 harness(projectscp, vmArgs)
972 972
973 def _unittest(args, annotations, prefixcp="", whitelist=None, verbose=False, enable_timing=False, regex=None, color=False, eager_stacktrace=False): 973 def _unittest(args, annotations, prefixcp="", whitelist=None, verbose=False, enable_timing=False, regex=None, color=False, eager_stacktrace=False, gc_after_test=False):
974 mxdir = dirname(__file__) 974 mxdir = dirname(__file__)
975 name = 'JUnitWrapper' 975 name = 'JUnitWrapper'
976 javaSource = join(mxdir, name + '.java') 976 javaSource = join(mxdir, name + '.java')
977 javaClass = join(mxdir, name + '.class') 977 javaClass = join(mxdir, name + '.class')
978 testfile = os.environ.get('MX_TESTFILE', None) 978 testfile = os.environ.get('MX_TESTFILE', None)
991 coreArgs.append('-JUnitEnableTiming') 991 coreArgs.append('-JUnitEnableTiming')
992 if color: 992 if color:
993 coreArgs.append('-JUnitColor') 993 coreArgs.append('-JUnitColor')
994 if eager_stacktrace: 994 if eager_stacktrace:
995 coreArgs.append('-JUnitEagerStackTrace') 995 coreArgs.append('-JUnitEagerStackTrace')
996 if gc_after_test:
997 coreArgs.append('-JUnitGCAfterTest')
996 998
997 999
998 def harness(projectscp, vmArgs): 1000 def harness(projectscp, vmArgs):
999 if _get_vm() != 'graal': 1001 if _get_vm() != 'graal':
1000 prefixArgs = ['-esa', '-ea'] 1002 prefixArgs = ['-esa', '-ea']
1023 --verbose enable verbose JUnit output 1025 --verbose enable verbose JUnit output
1024 --enable-timing enable JUnit test timing 1026 --enable-timing enable JUnit test timing
1025 --regex <regex> run only testcases matching a regular expression 1027 --regex <regex> run only testcases matching a regular expression
1026 --color enable colors output 1028 --color enable colors output
1027 --eager-stacktrace print stacktrace eagerly 1029 --eager-stacktrace print stacktrace eagerly
1030 --gc-after-test force a GC after each test
1028 1031
1029 To avoid conflicts with VM options '--' can be used as delimiter. 1032 To avoid conflicts with VM options '--' can be used as delimiter.
1030 1033
1031 If filters are supplied, only tests whose fully qualified name 1034 If filters are supplied, only tests whose fully qualified name
1032 includes a filter as a substring are run. 1035 includes a filter as a substring are run.
1065 parser.add_argument('--verbose', help='enable verbose JUnit output', action='store_true') 1068 parser.add_argument('--verbose', help='enable verbose JUnit output', action='store_true')
1066 parser.add_argument('--enable-timing', help='enable JUnit test timing', action='store_true') 1069 parser.add_argument('--enable-timing', help='enable JUnit test timing', action='store_true')
1067 parser.add_argument('--regex', help='run only testcases matching a regular expression', metavar='<regex>') 1070 parser.add_argument('--regex', help='run only testcases matching a regular expression', metavar='<regex>')
1068 parser.add_argument('--color', help='enable color output', action='store_true') 1071 parser.add_argument('--color', help='enable color output', action='store_true')
1069 parser.add_argument('--eager-stacktrace', help='print stacktrace eagerly', action='store_true') 1072 parser.add_argument('--eager-stacktrace', help='print stacktrace eagerly', action='store_true')
1073 parser.add_argument('--gc-after-test', help='force a GC after each test', action='store_true')
1070 1074
1071 ut_args = [] 1075 ut_args = []
1072 delimiter = False 1076 delimiter = False
1073 # check for delimiter 1077 # check for delimiter
1074 while len(args) > 0: 1078 while len(args) > 0:
1822 out = 'coverage' 1826 out = 'coverage'
1823 if len(args) == 1: 1827 if len(args) == 1:
1824 out = args[0] 1828 out = args[0]
1825 elif len(args) > 1: 1829 elif len(args) > 1:
1826 mx.abort('jacocoreport takes only one argument : an output directory') 1830 mx.abort('jacocoreport takes only one argument : an output directory')
1827 mx.run_java(['-jar', jacocoreport.get_path(True), '-in', 'jacoco.exec', '-g', join(_graal_home, 'graal'), out]) 1831 mx.run_java(['-jar', jacocoreport.get_path(True), '--in', 'jacoco.exec', '--out', out] + [p.dir for p in mx.projects()])
1828 1832
1829 def sl(args): 1833 def sl(args):
1830 """run an SL program""" 1834 """run an SL program"""
1831 vmArgs, slArgs = _extract_VM_args(args) 1835 vmArgs, slArgs = _extract_VM_args(args)
1832 vm(vmArgs + ['-cp', mx.classpath("com.oracle.truffle.sl"), "com.oracle.truffle.sl.SLMain"] + slArgs) 1836 vm(vmArgs + ['-cp', mx.classpath("com.oracle.truffle.sl"), "com.oracle.truffle.sl.SLMain"] + slArgs)