Mercurial > hg > graal-compiler

comparison mx/mx_graal.py @ 15322:404d29e8cee6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: remove longunittest
author Bernhard Urban <bernhard.urban@jku.at>
date Wed, 23 Apr 2014 11:42:58 +0200
parents dc2dd913c47e
children 6b3bb5a9a889
comparison
equal deleted inserted replaced
15321:c6fcb4a36c6a 15322:404d29e8cee6
974 with open(join(_graal_home, baseline_whitelist_file)) as fp: 974 with open(join(_graal_home, baseline_whitelist_file)) as fp:
975 whitelist = [l.rstrip() for l in fp.readlines()] 975 whitelist = [l.rstrip() for l in fp.readlines()]
976 except IOError: 976 except IOError:
977 mx.log('warning: could not read baseline whitelist: ' + baseline_whitelist_file) 977 mx.log('warning: could not read baseline whitelist: ' + baseline_whitelist_file)
978 978
979 if parsed_args.long_only: 979 if parsed_args.short_only:
980 annotations = ['@LongTest', '@Parameters']
981 elif parsed_args.short_only:
982 annotations = ['@Test'] 980 annotations = ['@Test']
983 else: 981 else:
984 annotations = ['@Test', '@LongTest', '@Parameters'] 982 annotations = ['@Test', '@Parameters']
985 983
986 _unittest(args, annotations, whitelist=whitelist) 984 _unittest(args, annotations, whitelist=whitelist)
987 985
988 def shortunittest(args): 986 def shortunittest(args):
989 """alias for 'unittest --short-only'{0}""" 987 """alias for 'unittest --short-only'{0}"""
990 988
991 args.insert(0, '--short-only') 989 args.insert(0, '--short-only')
992 unittest(args)
993
994 def longunittest(args):
995 """alias for 'unittest --long-only'{0}"""
996
997 args.insert(0, '--long-only')
998 unittest(args) 990 unittest(args)
999 991
1000 def buildvms(args): 992 def buildvms(args):
1001 """build one or more VMs in various configurations""" 993 """build one or more VMs in various configurations"""
1002 994
1721 1713
1722 def trufflejar(args=None): 1714 def trufflejar(args=None):
1723 """make truffle.jar""" 1715 """make truffle.jar"""
1724 1716
1725 # Test with the built classes 1717 # Test with the built classes
1726 _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@LongTest', '@Parameters']) 1718 _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@Parameters'])
1727 1719
1728 # We use the DSL processor as the starting point for the classpath - this 1720 # We use the DSL processor as the starting point for the classpath - this
1729 # therefore includes the DSL processor, the DSL and the API. 1721 # therefore includes the DSL processor, the DSL and the API.
1730 packagejar(mx.classpath("com.oracle.truffle.dsl.processor").split(os.pathsep), "truffle.jar", None, "com.oracle.truffle.dsl.processor.TruffleProcessor") 1722 packagejar(mx.classpath("com.oracle.truffle.dsl.processor").split(os.pathsep), "truffle.jar", None, "com.oracle.truffle.dsl.processor.TruffleProcessor")
1731 1723
1732 # Test with the JAR 1724 # Test with the JAR
1733 _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@LongTest', '@Parameters'], "truffle.jar:") 1725 _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@Parameters'], "truffle.jar:")
1734 1726
1735 1727
1736 def isGraalEnabled(vm): 1728 def isGraalEnabled(vm):
1737 return vm != 'original' and not vm.endswith('nograal') 1729 return vm != 'original' and not vm.endswith('nograal')
1738 1730
1951 'specjbb2013': [specjbb2013, '[VM options] [-- [SPECjbb2013 options]]'], 1943 'specjbb2013': [specjbb2013, '[VM options] [-- [SPECjbb2013 options]]'],
1952 'specjbb2005': [specjbb2005, '[VM options] [-- [SPECjbb2005 options]]'], 1944 'specjbb2005': [specjbb2005, '[VM options] [-- [SPECjbb2005 options]]'],
1953 'gate' : [gate, '[-options]'], 1945 'gate' : [gate, '[-options]'],
1954 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'], 1946 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'],
1955 'unittest' : [unittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix], 1947 'unittest' : [unittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix],
1956 'longunittest' : [longunittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix],
1957 'makejmhdeps' : [makejmhdeps, ''], 1948 'makejmhdeps' : [makejmhdeps, ''],
1958 'shortunittest' : [shortunittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix], 1949 'shortunittest' : [shortunittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix],
1959 'jacocoreport' : [jacocoreport, '[output directory]'], 1950 'jacocoreport' : [jacocoreport, '[output directory]'],
1960 'site' : [site, '[-options]'], 1951 'site' : [site, '[-options]'],
1961 'vm': [vm, '[-options] class [args...]'], 1952 'vm': [vm, '[-options] class [args...]'],