comparison mx.jvmci/mx_jvmci.py @ 22511:df5a7841f92a

revived support for specifying JVMCI options in <jre>/lib/jvmci/options
author Doug Simon <doug.simon@oracle.com>
date Thu, 03 Sep 2015 14:47:36 +0200
parents 63b12d69147d
children 1852abfbaca3
comparison
equal deleted inserted replaced
22510:45723ab25426 22511:df5a7841f92a
593 593
594 def _updateInstalledJVMCIOptionsFile(jdkDir): 594 def _updateInstalledJVMCIOptionsFile(jdkDir):
595 jvmciOptions = join(_suite.dir, 'jvmci.options') 595 jvmciOptions = join(_suite.dir, 'jvmci.options')
596 jreLibDir = join(jdkDir, 'jre', 'lib') 596 jreLibDir = join(jdkDir, 'jre', 'lib')
597 if exists(jvmciOptions): 597 if exists(jvmciOptions):
598 shutil.copy(jvmciOptions, join(jreLibDir, 'jvmci.options')) 598 shutil.copy(jvmciOptions, join(jreLibDir, 'jvmci', 'options'))
599 else: 599 else:
600 toDelete = join(jreLibDir, 'jvmci.options') 600 toDelete = join(jreLibDir, 'jvmci', 'options')
601 if exists(toDelete): 601 if exists(toDelete):
602 os.unlink(toDelete) 602 os.unlink(toDelete)
603 603
604 def copyToJdk(src, dst, permissions=JDK_UNIX_PERMISSIONS_FILE): 604 def copyToJdk(src, dst, permissions=JDK_UNIX_PERMISSIONS_FILE):
605 name = os.path.basename(src) 605 name = os.path.basename(src)