Mercurial > hg > graal-jvmci-8
changeset 4240:394424b7df1a
Disabled certain DaCapo tests for fastdebug testing in the gate.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 06 Jan 2012 18:35:39 +0100 |
parents | 676feaf8adee |
children | 8fece0287975 |
files | mx/commands.py mx/sanitycheck.py |
diffstat | 2 files changed, 23 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/commands.py Fri Jan 06 17:45:40 2012 +0100 +++ b/mx/commands.py Fri Jan 06 18:35:39 2012 +0100 @@ -219,7 +219,7 @@ if build == 'product': return jdk - elif build in ['debug', 'fastdebug', 'optimized']: + elif build in ['debug', 'fastdebug']: res = join(jdk, build) if not exists(res): if not create: @@ -580,7 +580,7 @@ unittest([]) t.stop() - for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate): + for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild): t = Task(str(test) + ':' + vmbuild) if not test.test('-graal'): t.abort(test.group + ' ' + test.name + ' Failed') @@ -628,11 +628,10 @@ mx.add_argument('--product', action='store_const', dest='vmbuild', const='product', help='select the product VM') mx.add_argument('--debug', action='store_const', dest='vmbuild', const='debug', help='select the debug VM') mx.add_argument('--fastdebug', action='store_const', dest='vmbuild', const='fastdebug', help='select the fast debug VM') - mx.add_argument('--optimized', action='store_const', dest='vmbuild', const='optimized', help='select the optimized VM') commands.update({ 'export': [export, '[-options] [zipfile]'], - 'build': [build, '[-options] [product|debug|fastdebug|optimized]...'] + 'build': [build, '[-options] [product|debug|fastdebug]...'] }) mx.commands.update(commands)
--- a/mx/sanitycheck.py Fri Jan 06 17:45:40 2012 +0100 +++ b/mx/sanitycheck.py Fri Jan 06 18:35:39 2012 +0100 @@ -47,6 +47,23 @@ 'xalan': [0, 0, 5, 10, 15], } +dacapoGateBuildLevels = { + 'avrora': ['product', 'fastdebug', 'debug'], + 'batik': ['product', 'fastdebug', 'debug'], + 'eclipse': ['product'], + 'fop': ['product', 'fastdebug', 'debug'], + 'h2': ['product', 'fastdebug', 'debug'], + 'jython': ['product', 'fastdebug', 'debug'], + 'luindex': ['product', 'fastdebug', 'debug'], + 'lusearch': ['product'], + 'pmd': ['product', 'fastdebug', 'debug'], + 'sunflow': ['product', 'fastdebug', 'debug'], + 'tomcat': ['product', 'fastdebug', 'debug'], + 'tradebeans': ['product', 'fastdebug', 'debug'], + 'tradesoap': ['product', 'fastdebug', 'debug'], + 'xalan': ['product', 'fastdebug', 'debug'], +} + class SanityCheckLevel: Fast, Gate, Normal, Extensive, Benchmark = range(5) @@ -72,12 +89,13 @@ return Test("SPECjvm2008", "SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts, [success], [error], [matcher], vmOpts=['-Xms2g'], defaultCwd=specjvm2008) -def getDacapos(level=SanityCheckLevel.Normal, dacapoArgs=[]): +def getDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]): checks = [] for (bench, ns) in dacapoSanityWarmup.items(): if ns[level] > 0: - checks.append(getDacapo(bench, ns[level], dacapoArgs)) + if gateBuildLevel is None or gateBuildLevel in dacapoGateBuildLevels[bench]: + checks.append(getDacapo(bench, ns[level], dacapoArgs)) return checks