Mercurial > hg > truffle
comparison mx/sanitycheck.py @ 7362:3a8e79636f8e
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Sun, 13 Jan 2013 21:55:49 +0100 |
parents | dd903cdfe708 |
children | cbcee2e1ce51 |
comparison
equal
deleted
inserted
replaced
7361:b79ad92d5a26 | 7362:3a8e79636f8e |
---|---|
108 success = re.compile(r"^Valid run, Score is [0-9]+$") | 108 success = re.compile(r"^Valid run, Score is [0-9]+$") |
109 matcher = Matcher(score, {'const:group' : "const:SPECjbb2005", 'const:name' : 'const:score', 'const:score' : 'score'}) | 109 matcher = Matcher(score, {'const:group' : "const:SPECjbb2005", 'const:name' : 'const:score', 'const:score' : 'score'}) |
110 classpath = ['jbb.jar', 'check.jar'] | 110 classpath = ['jbb.jar', 'check.jar'] |
111 return Test("SPECjbb2005", ['spec.jbb.JBBmain', '-propfile', 'SPECjbb.props'] + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g', '-XX:+UseSerialGC', '-cp', os.pathsep.join(classpath)], defaultCwd=specjbb2005) | 111 return Test("SPECjbb2005", ['spec.jbb.JBBmain', '-propfile', 'SPECjbb.props'] + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g', '-XX:+UseSerialGC', '-cp', os.pathsep.join(classpath)], defaultCwd=specjbb2005) |
112 | 112 |
113 def getSPECjvm2008(benchArgs = [], skipKitValidation=False, warmupTime=None, iterationTime=None): | 113 def getSPECjvm2008(benchArgs = [], skipCheck=False, skipKitValidation=False, warmupTime=None, iterationTime=None): |
114 | 114 |
115 specjvm2008 = mx.get_env('SPECJVM2008') | 115 specjvm2008 = mx.get_env('SPECJVM2008') |
116 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')): | 116 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')): |
117 mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory') | 117 mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory') |
118 | 118 |
127 opts += ['-wt', str(warmupTime)] | 127 opts += ['-wt', str(warmupTime)] |
128 if iterationTime is not None: | 128 if iterationTime is not None: |
129 opts += ['-it', str(iterationTime)] | 129 opts += ['-it', str(iterationTime)] |
130 if skipKitValidation: | 130 if skipKitValidation: |
131 opts += ['-ikv'] | 131 opts += ['-ikv'] |
132 if skipCheck: | |
133 opts += ['-ict'] | |
132 | 134 |
133 return Test("SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g', '-XX:+UseSerialGC'], defaultCwd=specjvm2008) | 135 return Test("SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g', '-XX:+UseSerialGC'], defaultCwd=specjvm2008) |
134 | 136 |
135 def getDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]): | 137 def getDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]): |
136 checks = [] | 138 checks = [] |