comparison mx/mx_graal.py @ 16526:446750355e5f

Merge
author Stefan Anzinger <stefan.anzinger@gmail.com>
date Tue, 15 Jul 2014 19:21:28 -0700
parents a0f3688ce052
children 89be7c4db12c
comparison
equal deleted inserted replaced
16525:072b9501f5f9 16526:446750355e5f
1279 with VM('graal', 'product'): 1279 with VM('graal', 'product'):
1280 t = Task('DaCapo_pmd:BatchMode:product') 1280 t = Task('DaCapo_pmd:BatchMode:product')
1281 dacapo(['-Xbatch', 'pmd']) 1281 dacapo(['-Xbatch', 'pmd'])
1282 tasks.append(t.stop()) 1282 tasks.append(t.stop())
1283 1283
1284 # ensure -Xcomp still works
1285 with VM('graal', 'product'):
1286 t = Task('XCompMode:product')
1287 vm(['-Xcomp', '-version'])
1288 tasks.append(t.stop())
1289
1284 if args.jacocout is not None: 1290 if args.jacocout is not None:
1285 jacocoreport([args.jacocout]) 1291 jacocoreport([args.jacocout])
1286 1292
1287 global _jacoco 1293 global _jacoco
1288 _jacoco = 'off' 1294 _jacoco = 'off'
2047 findbugsLib = join(_graal_home, 'lib', 'findbugs-3.0.0') 2053 findbugsLib = join(_graal_home, 'lib', 'findbugs-3.0.0')
2048 if not exists(findbugsLib): 2054 if not exists(findbugsLib):
2049 tmp = tempfile.mkdtemp(prefix='findbugs-download-tmp', dir=_graal_home) 2055 tmp = tempfile.mkdtemp(prefix='findbugs-download-tmp', dir=_graal_home)
2050 try: 2056 try:
2051 findbugsDist = join(tmp, 'findbugs.zip') 2057 findbugsDist = join(tmp, 'findbugs.zip')
2052 mx.download(findbugsDist, ['http://sourceforge.net/projects/findbugs/files/findbugs/3.0.0/findbugs-3.0.0-dev-20131204-e3cbbd5.zip']) 2058 mx.download(findbugsDist, ['http://lafo.ssw.uni-linz.ac.at/graal-external-deps/findbugs-3.0.0.zip', 'http://sourceforge.net/projects/findbugs/files/findbugs/3.0.0/findbugs-3.0.0.zip'])
2053 with zipfile.ZipFile(findbugsDist) as zf: 2059 with zipfile.ZipFile(findbugsDist) as zf:
2054 candidates = [e for e in zf.namelist() if e.endswith('/lib/findbugs.jar')] 2060 candidates = [e for e in zf.namelist() if e.endswith('/lib/findbugs.jar')]
2055 assert len(candidates) == 1, candidates 2061 assert len(candidates) == 1, candidates
2056 libDirInZip = os.path.dirname(candidates[0]) 2062 libDirInZip = os.path.dirname(candidates[0])
2057 zf.extractall(tmp) 2063 zf.extractall(tmp)