Mercurial > hg > graal-jvmci-8

comparison mx.jvmci/mx_jvmci.py @ 22290:5425cd72bd3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused --check-distributions flag.
author Roland Schatz <roland.schatz@oracle.com>
date Thu, 23 Jul 2015 15:45:09 +0200
parents 5cce6c398d70
children ccee68149d93
comparison
equal deleted inserted replaced
22289:26e2a05f8d95 22290:5425cd72bd3a
1098 vmbuildsDefault = ','.join(_vmbuildChoices) 1098 vmbuildsDefault = ','.join(_vmbuildChoices)
1099 1099
1100 parser = ArgumentParser(prog='mx buildvms') 1100 parser = ArgumentParser(prog='mx buildvms')
1101 parser.add_argument('--vms', help='a comma separated list of VMs to build (default: ' + vmsDefault + ')', metavar='<args>', default=vmsDefault) 1101 parser.add_argument('--vms', help='a comma separated list of VMs to build (default: ' + vmsDefault + ')', metavar='<args>', default=vmsDefault)
1102 parser.add_argument('--builds', help='a comma separated list of build types (default: ' + vmbuildsDefault + ')', metavar='<args>', default=vmbuildsDefault) 1102 parser.add_argument('--builds', help='a comma separated list of build types (default: ' + vmbuildsDefault + ')', metavar='<args>', default=vmbuildsDefault)
1103 parser.add_argument('--check-distributions', action='store_true', dest='check_distributions', help='check built distributions for overlap')
1104 parser.add_argument('-n', '--no-check', action='store_true', help='omit running "java -version" after each build') 1103 parser.add_argument('-n', '--no-check', action='store_true', help='omit running "java -version" after each build')
1105 parser.add_argument('-c', '--console', action='store_true', help='send build output to console instead of log file') 1104 parser.add_argument('-c', '--console', action='store_true', help='send build output to console instead of log file')
1106 1105
1107 args = parser.parse_args(args) 1106 args = parser.parse_args(args)
1108 vms = args.vms.split(',') 1107 vms = args.vms.split(',')
1109 builds = args.builds.split(',') 1108 builds = args.builds.split(',')
1110 1109
1111 allStart = time.time() 1110 allStart = time.time()
1112 check_dists_args = ['--check-distributions'] if args.check_distributions else []
1113 for v in vms: 1111 for v in vms:
1114 if not isVMSupported(v): 1112 if not isVMSupported(v):
1115 mx.log('The ' + v + ' VM is not supported on this platform - skipping') 1113 mx.log('The ' + v + ' VM is not supported on this platform - skipping')
1116 continue 1114 continue
1117 1115
1123 log = open(join(_suite.dir, logFile), 'wb') 1121 log = open(join(_suite.dir, logFile), 'wb')
1124 start = time.time() 1122 start = time.time()
1125 mx.log('BEGIN: ' + v + '-' + vmbuild + '\t(see: ' + logFile + ')') 1123 mx.log('BEGIN: ' + v + '-' + vmbuild + '\t(see: ' + logFile + ')')
1126 verbose = ['-v'] if mx._opts.verbose else [] 1124 verbose = ['-v'] if mx._opts.verbose else []
1127 # Run as subprocess so that output can be directed to a file 1125 # Run as subprocess so that output can be directed to a file
1128 cmd = [sys.executable, '-u', mx.__file__] + verbose + ['--vm', v, '--vmbuild', vmbuild, 'build'] + check_dists_args 1126 cmd = [sys.executable, '-u', mx.__file__] + verbose + ['--vm', v, '--vmbuild', vmbuild, 'build']
1129 mx.logv("executing command: " + str(cmd)) 1127 mx.logv("executing command: " + str(cmd))
1130 subprocess.check_call(cmd, cwd=_suite.dir, stdout=log, stderr=subprocess.STDOUT) 1128 subprocess.check_call(cmd, cwd=_suite.dir, stdout=log, stderr=subprocess.STDOUT)
1131 duration = datetime.timedelta(seconds=time.time() - start) 1129 duration = datetime.timedelta(seconds=time.time() - start)
1132 mx.log('END: ' + v + '-' + vmbuild + '\t[' + str(duration) + ']') 1130 mx.log('END: ' + v + '-' + vmbuild + '\t[' + str(duration) + ']')
1133 else: 1131 else:
1134 with VM(v, vmbuild): 1132 with VM(v, vmbuild):
1135 build(check_dists_args) 1133 build()
1136 if not args.no_check: 1134 if not args.no_check:
1137 vmargs = ['-version'] 1135 vmargs = ['-version']
1138 if v == 'jvmci': 1136 if v == 'jvmci':
1139 vmargs.insert(0, '-XX:-BootstrapJVMCI') 1137 vmargs.insert(0, '-XX:-BootstrapJVMCI')
1140 vm(vmargs, vm=v, vmbuild=vmbuild) 1138 vm(vmargs, vm=v, vmbuild=vmbuild)