Mercurial > hg > graal-jvmci-8
comparison mx/commands.py @ 7226:8a3efb8c831d
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 14 Dec 2012 13:02:49 +0100 |
parents | c356cab093bc |
children | 76c9023ed438 |
comparison
equal
deleted
inserted
replaced
7225:31c4d9f9e922 | 7226:8a3efb8c831d |
---|---|
548 env = os.environ | 548 env = os.environ |
549 env.setdefault('ARCH_DATA_MODEL', '64') | 549 env.setdefault('ARCH_DATA_MODEL', '64') |
550 env.setdefault('LANG', 'C') | 550 env.setdefault('LANG', 'C') |
551 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus)) | 551 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus)) |
552 env['ALT_BOOTDIR'] = jdk | 552 env['ALT_BOOTDIR'] = jdk |
553 if not env.has_key('OMIT_GRAAL'): | |
554 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD | |
553 env.setdefault('INSTALL', 'y') | 555 env.setdefault('INSTALL', 'y') |
554 if mx.get_os() == 'solaris' : | 556 if mx.get_os() == 'solaris' : |
555 # If using sparcWorks, setup flags to avoid make complaining about CC version | 557 # If using sparcWorks, setup flags to avoid make complaining about CC version |
556 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0] | 558 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0] |
557 if cCompilerVersion.startswith('CC: Sun C++') : | 559 if cCompilerVersion.startswith('CC: Sun C++') : |
838 for theVm in ['client', 'server']: | 840 for theVm in ['client', 'server']: |
839 _vm = theVm | 841 _vm = theVm |
840 | 842 |
841 t = Task('DaCapo_pmd:' + theVm + ':' + vmbuild) | 843 t = Task('DaCapo_pmd:' + theVm + ':' + vmbuild) |
842 dacapo(['pmd']) | 844 dacapo(['pmd']) |
845 tasks.append(t.stop()) | |
846 | |
847 t = Task('UnitTests:' + theVm + ':' + vmbuild) | |
848 unittest(['@-XX:CompileCommand=exclude,*::run*', 'graal.api']) | |
843 tasks.append(t.stop()) | 849 tasks.append(t.stop()) |
844 | 850 |
845 except KeyboardInterrupt: | 851 except KeyboardInterrupt: |
846 total.abort(1) | 852 total.abort(1) |
847 | 853 |